From 01b5ddaa08727e182ef951c614d7fa18bf3cb5af Mon Sep 17 00:00:00 2001
From: Julian Aloofi <julian.fedora@googlemail.com>
Date: Tue, 9 Aug 2011 13:25:10 +0200
Subject: [PATCH] Merge branches 'master' and 'f16' into f16