Merge branch 'rc-fixes' into for-next
authorMichal Marek <mmarek@suse.cz>
Wed, 29 Dec 2010 22:32:15 +0000 (22:32 +0000)
committerMichal Marek <mmarek@suse.cz>
Wed, 29 Dec 2010 22:32:15 +0000 (22:32 +0000)

Trivial merge