[clanbomber/f14/master: 4/4] Merge remote-tracking branch 'origin/master' into f14/master

[Hans de Goede]

commit fed28b9989763d42321b24e253744ca1fcbe72a3
Merge: 42bc417 4186c34
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Mon Apr 4 10:20:45 2011 +0200

    Merge remote-tracking branch 'origin/master' into f14/master

 clanbomber.spec |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
---