Merge branch 'packaging' into for-next
authorMichal Marek <mmarek@suse.cz>
Wed, 29 Dec 2010 13:25:57 +0000 (13:25 +0000)
committerMichal Marek <mmarek@suse.cz>
Wed, 29 Dec 2010 13:25:57 +0000 (13:25 +0000)

Trivial merge