[zeroinstall-injector/el6: 2/2] Merge branch 'master' into el6

[Michel Alexandre Salim]

commit 293bbdf2a9a3e7a7e8e8bca91ea6fd630dba94bc
Merge: 328c21f a10208a
Author: Michel Alexandre Salim <michel.salim at cs.fau.de>
Date:   Fri Jun 17 10:27:49 2011 +0200

    Merge branch 'master' into el6

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