[dumb/f13/master: 4/4] Merge remote branch 'origin/master' into f13/master

[Hans de Goede]

commit e96683c61f3df4dfd3fb9426d66a7c5b2b94f5dd
Merge: c1b2ede ed71678
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Wed Mar 16 16:56:36 2011 +0100

    Merge remote branch 'origin/master' into f13/master

 dumb.spec |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
---