Merge branch 'rc-fixes' into for-next
authorMichal Marek <mmarek@suse.cz>
Tue, 15 Jun 2010 10:46:49 +0000 (10:46 +0000)
committerMichal Marek <mmarek@suse.cz>
Tue, 15 Jun 2010 10:46:49 +0000 (10:46 +0000)

Trivial merge