[zeroinstall-injector/f13/master: 9/10] Merge commit '70db78cf257fd711383653404c29ef76ad11ca4b' into f13

[Michel Alexandre Salim]

commit 524f2bf22bd8d3d0e1195af46131cbe333f95503
Merge: 687c49d 70db78c
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Sun Mar 13 01:31:36 2011 +0100

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

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