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

[Pierre-YvesChibon]

commit 1dc3fadcc87f96b83e9bfc790fd93fe1149d8b68
Merge: 9528eea fbd1c12
Author: Pierre-Yves Chibon <pingou at pingoured.fr>
Date:   Thu Dec 15 23:08:01 2011 +0100

    Merge branch 'master' into f15

 packagedb-cli.spec |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---