From: Jan Rękorajski <baggins@pld-linux.org>
Date: Fri, 23 Nov 2012 07:13:45 +0000 (+0100)
Subject: Merge branch 'master' into db52
X-Git-Tag: auto/th/rpm-5.4.10-35.1~15
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=4899c4ec94c7726a088486103d7c4399bab9d221;p=packages%2Frpm.git

Merge branch 'master' into db52

Conflicts:
	rpm-db5.2.patch
	rpm.spec
---

4899c4ec94c7726a088486103d7c4399bab9d221