Squashed commit of the following:

commit c1f92093c8fa985c35d2fbcbb9171d82842983dd
Author: Ton Kersten <github@tonkersten.com>
Date:   Mon Apr 29 19:23:42 2013 +0200

    Fixed RPM building for 1.2