Merge branch 'master' of ssh://skeezixgit@git.openpandora.org/srv/git/pandora-libraries
authorskeezix <skeezix@flotsam-vm.(none)>
Mon, 30 Aug 2010 01:47:09 +0000 (21:47 -0400)
committerskeezix <skeezix@flotsam-vm.(none)>
Mon, 30 Aug 2010 01:47:09 +0000 (21:47 -0400)

Trivial merge