Merge branch 'separate-suse'
authorJoey Hess <joey@kitenet.net>
Wed, 4 Jan 2012 22:00:00 +0000 (18:00 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 4 Jan 2012 22:00:00 +0000 (18:00 -0400)
Conflicts:
debian/copyright
zgz/pit/suse-bzip2/blocksort.c


Trivial merge