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

[Pierre-YvesChibon]

commit 8100135ff0c241611740e34301d79048f933a15c
Merge: 9c33d0e fbd1c12
Author: Pierre-Yves Chibon <pingou at pingoured.fr>
Date:   Thu Dec 15 23:09:22 2011 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	packagedb-cli.spec

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