From: Joey Hess <joey@kitenet.net>
Date: Wed, 4 Jan 2012 22:00:00 +0000 (-0400)
Subject: Merge branch 'separate-suse'
X-Git-Tag: 1.16~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e1a86ab9c70af8d852c4804dcb42b14bc5d0c19a;p=tools%2Fpristine-tar.git

Merge branch 'separate-suse'

Conflicts:
	debian/copyright
	zgz/pit/suse-bzip2/blocksort.c
---

e1a86ab9c70af8d852c4804dcb42b14bc5d0c19a