[rpm/f16: 6/6] Merge branch 'master' into f16

[Panu Matilainen]

commit 839293f5093e44506f50a4ae7071ff547e3bc9a0
Merge: 4fff596 a6258cc
Author: Panu Matilainen <Panu Matilainen pmatilai at redhat.com>
Date:   Mon Aug 15 13:06:21 2011 +0300

    Merge branch 'master' into f16

 .gitignore                  |    1 +
 rpm-4.9.1-recurse-dir.patch |   43 -------------------------------------------
 rpm-4.9.1.1-ld-flags.patch  |   15 +++++++++++++++
 rpm.spec                    |   14 ++++++++++----
 sources                     |    3 +--
 5 files changed, 27 insertions(+), 49 deletions(-)
---