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

[Pierre-YvesChibon]

commit 7738a7b00323b5419856bb281cc4f683669b7d45
Merge: 1dfa3a9 cabb614
Author: Pierre-Yves Chibon <pingou at pingoured.fr>
Date:   Thu Jul 28 17:29:06 2011 +0200

    Merge branch 'master' into f15

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