#44 - Release 04.07.2013: fix merge conflict
#44 - Release 04.07.2013: fix merge conflict
#44 - Release 04.07.2013: fix merge conflict
#44 - Release 04.07.2013: fix merge conflict
fix merge conflict