[zeroinstall-injector/el6/master: 10/11] Merge commit '70db78cf257fd711383653404c29ef76ad11ca4b' into el6

[Michel Alexandre Salim]

commit 4a709ee949f0b6ff26f979d3c08bec0eb4e94f4c
Merge: fa66227 70db78c
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Sun Mar 13 01:36:15 2011 +0100

    Merge commit '70db78cf257fd711383653404c29ef76ad11ca4b' into el6
    
    Conflicts:
    	zeroinstall-injector.spec

 zeroinstall-injector.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---