Merge git://github.com/avuton/flac
authorErik de Castro Lopo <erikd@mega-nerd.com>
Thu, 2 Feb 2012 06:45:09 +0000 (17:45 +1100)
committerErik de Castro Lopo <erikd@mega-nerd.com>
Thu, 2 Feb 2012 06:45:09 +0000 (17:45 +1100)

Trivial merge