Merge branch 'master' of ssh://skeezixgit@git.openpandora.org/srv/git/pandora-libraries
authorskeezix <skeezix@flotsam-vm.(none)>
Sat, 6 Mar 2010 04:28:30 +0000 (23:28 -0500)
committerskeezix <skeezix@flotsam-vm.(none)>
Sat, 6 Mar 2010 04:28:30 +0000 (23:28 -0500)

Trivial merge