Merge branch 'master' of git://git.openpandora.org/openpandora.oe