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

[Pierre-YvesChibon]

commit b02e317b384e9b5c203751cbfae80549ad349569
Merge: 0f08a01 5b1293f
Author: Pierre-Yves Chibon <pingou at pingoured.fr>
Date:   Thu Jul 28 18:09:10 2011 +0200

    Merge branch 'master' into f15

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