Merge branch 'trivial' into for-next
authorMichal Marek <mmarek@suse.cz>
Wed, 25 May 2011 15:24:57 +0000 (15:24 +0000)
committerMichal Marek <mmarek@suse.cz>
Wed, 25 May 2011 15:24:57 +0000 (15:24 +0000)

Trivial merge