Merge branch 'master' of ssh://skeezixgit@git.openpandora.org/srv/git/pandora-libraries
authorskeezix <skeezix@flotsam-vm.(none)>
Wed, 25 Aug 2010 02:42:53 +0000 (22:42 -0400)
committerskeezix <skeezix@flotsam-vm.(none)>
Wed, 25 Aug 2010 02:42:53 +0000 (22:42 -0400)

Trivial merge