[bolzplatz2006/f17: 3/3] Merge remote-tracking branch 'origin/master' into f17

[Hans de Goede]

commit 710b03beb4258d0f9ec5cd9eaae383db5a3d2054
Merge: 385e8fc e1ab764
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Fri Apr 6 20:26:54 2012 +0200

    Merge remote-tracking branch 'origin/master' into f17
    
    Conflicts:
    	bolzplatz2006.spec

 bolzplatz2006.spec |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)
---