commit 950beeff516855470258f87ad750213c607c2d11 Author: Julian Aloofi <julian.fedora at googlemail.com> Date: Sun Jul 3 18:13:03 2011 +0200 Merge branches 'master' and 'f14' into f14