commit 1f36fb612ae1029e234901ee58a7cee757d7b1c2 Author: Julian Aloofi <julian.fedora at googlemail.com> Date: Sun Jul 3 17:59:46 2011 +0200 Merge branches 'master' and 'f15' into f15