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

[Michel Alexandre Salim]

commit f8e91ebbd4996978da5aac78fe26fc928b4466ce
Merge: c4fc6f0 f6612b9
Author: Michel Alexandre Salim <michel at sylvestre.me>
Date:   Tue Mar 22 10:13:17 2011 +0100

    Merge branch 'master' into el6

 .gitignore                |    2 +-
 sources                   |    2 +-
 zeroinstall-injector.spec |    5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)
---