Merge branch 'cleanup'
authormelinath <stephen.r.burrows@gmail.com>
Wed, 9 Jun 2010 17:49:56 +0000 (13:49 -0400)
committermelinath <stephen.r.burrows@gmail.com>
Wed, 9 Jun 2010 17:49:56 +0000 (13:49 -0400)
commitb988d30ee8173f12ff54d7f0228239bacf4c723e
tree641485b62fcc2adb97fc19d028181beec1770744
parentb645302b6e90e12b2912a936c6cfa77a9277cf96
parentba412401bcd900ab40a1ec0c2a390ddac330d533
Merge branch 'cleanup'