Merge branch 'trivial' into for-next
authorMichal Marek <mmarek@suse.cz>
Thu, 17 Mar 2011 13:12:38 +0000 (13:12 +0000)
committerMichal Marek <mmarek@suse.cz>
Thu, 17 Mar 2011 13:12:38 +0000 (13:12 +0000)

Trivial merge