Merge branch 'trivial' into for-next
authorMichal Marek <mmarek@suse.cz>
Mon, 18 Apr 2011 22:23:55 +0000 (22:23 +0000)
committerMichal Marek <mmarek@suse.cz>
Mon, 18 Apr 2011 22:23:55 +0000 (22:23 +0000)

Trivial merge