Merge branch 'master' of git://openpandora.org/pandora-misc