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

[Pierre-YvesChibon]

commit 0f08a014e342dd4c90932c7511514c9e398f11b7
Merge: 7738a7b 9efe4ce
Author: Pierre-Yves Chibon <pingou at pingoured.fr>
Date:   Thu Jul 28 18:07:22 2011 +0200

    Merge branch 'master' into f15

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