Merge branch 'packaging' into for-next
authorMichal Marek <mmarek@suse.cz>
Wed, 13 Oct 2010 22:02:30 +0000 (22:02 +0000)
committerMichal Marek <mmarek@suse.cz>
Wed, 13 Oct 2010 22:02:30 +0000 (22:02 +0000)

Trivial merge