commit 01b5ddaa08727e182ef951c614d7fa18bf3cb5af Author: Julian Aloofi <julian.fedora at googlemail.com> Date: Tue Aug 9 13:25:10 2011 +0200 Merge branches 'master' and 'f16' into f16