Merge branch 'waltop' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Sat, 23 Oct 2010 20:54:53 +0000 (22:54 +0200)
committerJiri Kosina <jkosina@suse.cz>
Sat, 23 Oct 2010 20:54:53 +0000 (22:54 +0200)

Trivial merge