[zeroinstall-injector/f13/master: 10/10] Merge branch 'master' into f13

[Michel Alexandre Salim]

commit f6e2e3f3a369c6c0cb17b6184c7edd1eb5c35dcf
Merge: 524f2bf 873b2fd
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Sun Mar 13 01:31:41 2011 +0100

    Merge branch 'master' into f13

 .gitignore                |    2 +-
 sources                   |    2 +-
 zeroinstall-injector.spec |   31 ++++++++++++++++++++++++++-----
 3 files changed, 28 insertions(+), 7 deletions(-)
---