Merge branch 'rc-fixes' into for-next
authorMichal Marek <mmarek@suse.cz>
Fri, 2 Jul 2010 10:06:49 +0000 (10:06 +0000)
committerMichal Marek <mmarek@suse.cz>
Fri, 2 Jul 2010 10:06:49 +0000 (10:06 +0000)

Trivial merge