Merge branch 'master' into for-next
authorJiri Kosina <jkosina@suse.cz>
Tue, 15 Feb 2011 09:24:31 +0000 (10:24 +0100)
committerJiri Kosina <jkosina@suse.cz>
Tue, 15 Feb 2011 09:24:31 +0000 (10:24 +0100)

Trivial merge