710b03b Merge remote-tracking branch 'origin/master' into f17

Merged and Committed by jwrdegoede 12 years ago
    Merge remote-tracking branch 'origin/master' into f17
    
    Conflicts:
    	bolzplatz2006.spec
    
        
file modified
+10 -2