commit 2ca9b9429212031b6924209d68abea27a53b749c
Merge: 4e64764 708e12e
Author: unknown <Carlo@.(none)>
Date:   Mon Apr 19 00:54:13 2010 +0200

    Merge branch 'master' of git://gitorious.org/amarok/amarok