Merge branch 'packaging' into for-next
authorMichal Marek <mmarek@suse.cz>
Wed, 4 May 2011 21:08:39 +0000 (21:08 +0000)
committerMichal Marek <mmarek@suse.cz>
Wed, 4 May 2011 21:08:39 +0000 (21:08 +0000)

Trivial merge