[packagedb-cli/f16: 3/3] Merge branch 'master' into f16

[Pierre-YvesChibon]

commit 3b5b3222cfd52932d3a6c0359c28a597954ce511
Merge: aaf196c 362a5c0
Author: Pierre-Yves Chibon <pingou at pingoured.fr>
Date:   Sat Jan 21 11:22:43 2012 +0100

    Merge branch 'master' into f16

 .gitignore         |    1 +
 packagedb-cli.spec |   12 +++++++++---
 sources            |    2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)
---