Merge branch 'rc-fixes' into for-next
authorMichal Marek <mmarek@suse.cz>
Fri, 20 Aug 2010 12:01:41 +0000 (12:01 +0000)
committerMichal Marek <mmarek@suse.cz>
Fri, 20 Aug 2010 12:01:41 +0000 (12:01 +0000)

Trivial merge