[packagedb-cli/f14: 2/4] Merge branch 'master' into f14

[Pierre-YvesChibon]

commit 1f3990b157a6e072101c69cd4bdcc597d2f8c44f
Merge: 1cd46d4 9efe4ce
Author: Pierre-Yves Chibon <pingou at pingoured.fr>
Date:   Thu Jul 28 18:07:25 2011 +0200

    Merge branch 'master' into f14

 packagedb-cli.spec |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
---