[boswars-addons/f13: 5/5] Merge branch 'master' into f13

[Bruno Wolff III]

commit e129c062ae364a73e9064322e94f5095502d1bae
Merge: 0b0ad15 d326248
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Tue May 31 05:51:13 2011 -0500

    Merge branch 'master' into f13

 .gitignore          |    1 +
 boswars-addons.spec |   36 ++++++++++++++++++++----------------
 sources             |   13 +++++--------
 3 files changed, 26 insertions(+), 24 deletions(-)
---