Merge branch 'packaging' into for-next
authorMichal Marek <mmarek@suse.cz>
Tue, 21 Dec 2010 15:13:20 +0000 (15:13 +0000)
committerMichal Marek <mmarek@suse.cz>
Tue, 21 Dec 2010 15:13:20 +0000 (15:13 +0000)

Trivial merge