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

[Pierre-YvesChibon]

commit 1dfa3a96222faeeba9fc9186d5d8830e284c0fe0
Merge: 68cb2ef f2a95a9
Author: Pierre-Yves Chibon <pingou at pingoured.fr>
Date:   Thu Jul 28 17:26:50 2011 +0200

    Merge branch 'master' into f15

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