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

[Pierre-YvesChibon]

commit e17f71c824c064f15fd3aeb5b5bbcb11d1f2b5ff
Merge: cda4652 fbd1c12
Author: Pierre-Yves Chibon <pingou at pingoured.fr>
Date:   Thu Dec 15 23:10:44 2011 +0100

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

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