Merge branch 'master' of ssh://openpandora.org/srv/git/pandora-libraries
authorsebt3 <sebastien.huss@gmail.com>
Mon, 13 Jun 2011 13:34:31 +0000 (09:34 -0400)
committersebt3 <sebastien.huss@gmail.com>
Mon, 13 Jun 2011 13:34:31 +0000 (09:34 -0400)

Trivial merge