Merge branches 'for-3.19/upstream-fixes', 'for-3.20/apple', 'for-3.20/betop', 'for...
authorJiri Kosina <jkosina@suse.cz>
Mon, 9 Feb 2015 10:17:45 +0000 (11:17 +0100)
committerJiri Kosina <jkosina@suse.cz>
Mon, 9 Feb 2015 10:17:45 +0000 (11:17 +0100)

Trivial merge