Jorim Jaggi 568e54be71 resolve merge conflicts of 87f5369 to master.
Change-Id: I5d1a7aaf48c4bf70f7181508aa46fbbcc2cf7086
2015-01-15 00:12:18 +01:00
..