Merge git://repo.or.cz/potpourri
commit7c3bb3344f6793d9abb4585677d53a0ea6cb78cf
authorBrian Caine <brian@mephistopheles.(none)>
Wed, 23 Jan 2008 22:42:09 +0000 (23 17:42 -0500)
committerBrian Caine <brian@mephistopheles.(none)>
Wed, 23 Jan 2008 22:42:09 +0000 (23 17:42 -0500)
tree562e065b736110f41248d72d1853a9a042d1aace
parent9cb30616ead6e068a3b6a89cb1b6935a86175b26
parentba03effef4cce1186d0ad2b2123cff4c8013cf6a
Merge git://repo.or.cz/potpourri