Merge branch 'master' of ssh://skeezixgit@git.openpandora.org/srv/git/pandora-libraries
authorskeezix <skeezix@flotsam-vm.(none)>
Wed, 9 Feb 2011 21:21:17 +0000 (16:21 -0500)
committerskeezix <skeezix@flotsam-vm.(none)>
Wed, 9 Feb 2011 21:21:17 +0000 (16:21 -0500)

Trivial merge