Merge branch 'master' into for-next
authorJiri Kosina <jkosina@suse.cz>
Tue, 28 May 2013 10:01:07 +0000 (12:01 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 28 May 2013 10:01:07 +0000 (12:01 +0200)

Trivial merge