Merge branch 'master' of ssh://skeezixgit@git.openpandora.org/srv/git/pandora-libraries
authorskeezix <skeezix@flotsam-vm.(none)>
Thu, 11 Mar 2010 20:48:33 +0000 (15:48 -0500)
committerskeezix <skeezix@flotsam-vm.(none)>
Thu, 11 Mar 2010 20:48:33 +0000 (15:48 -0500)

Trivial merge