Merge branch 'packaging' into for-next
authorMichal Marek <mmarek@suse.cz>
Tue, 24 May 2011 16:38:18 +0000 (16:38 +0000)
committerMichal Marek <mmarek@suse.cz>
Tue, 24 May 2011 16:38:18 +0000 (16:38 +0000)

Trivial merge