Merge branches 'tests' and 'fixes'
commit3e03a86e738abce2860f34b91f50bbcff97a3cb6
authorAlan Jenkins <alan@alan-eeepc.jenkins>
Mon, 23 Feb 2009 12:13:34 +0000 (23 12:13 +0000)
committerAlan Jenkins <alan@alan-eeepc.jenkins>
Mon, 23 Feb 2009 12:13:34 +0000 (23 12:13 +0000)
tree9ee56a4834994587b3d6923cb331f80812d24ae5
parentb52e1818085cb9bc3a61d184d5ff98d7335f0308
parent2b146d49b1b0dd2c9492a47f524206afa64c53f7
Merge branches 'tests' and 'fixes'