Merge branch 'master' of https://github.com/taglib/taglib
authorMathias Panzenböck <grosser.meister.morti@gmx.net>
Sun, 26 Jun 2011 18:58:32 +0000 (20:58 +0200)
committerMathias Panzenböck <grosser.meister.morti@gmx.net>
Sun, 26 Jun 2011 18:58:32 +0000 (20:58 +0200)

Trivial merge