Merge branch 'rc-fixes' into for-next
authorMichal Marek <mmarek@suse.cz>
Sat, 21 Aug 2010 13:19:15 +0000 (13:19 +0000)
committerMichal Marek <mmarek@suse.cz>
Sat, 21 Aug 2010 13:19:15 +0000 (13:19 +0000)

Trivial merge