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

[Pierre-YvesChibon]

commit 556cb78387e1e148fcbe587da870401b238ae3fd
Merge: 68cb2ef 274c624
Author: Pierre-Yves Chibon <pingou at pingoured.fr>
Date:   Fri Nov 11 15:13:11 2011 +0100

    Merge branch 'master' into f15

 .gitignore         |    1 +
 packagedb-cli.spec |   17 ++++++++++++-----
 sources            |    2 +-
 3 files changed, 14 insertions(+), 6 deletions(-)
---