Merge branch 'master' of ssh://skeezixgit@git.openpandora.org/srv/git/pandora-libraries
authorskeezix <skeezix@flotsam-vm.(none)>
Mon, 15 Feb 2010 19:29:48 +0000 (14:29 -0500)
committerskeezix <skeezix@flotsam-vm.(none)>
Mon, 15 Feb 2010 19:29:48 +0000 (14:29 -0500)

Trivial merge