Merge with 0.6
authorMatthew Wild <mwild1@gmail.com>
Wed, 25 Nov 2009 19:58:58 +0000 (19:58 +0000)
committerMatthew Wild <mwild1@gmail.com>
Wed, 25 Nov 2009 19:58:58 +0000 (19:58 +0000)
commit2b69d1586fadb43f2838d4c17bc8ab08eb578057
treeff3dacf12f0c97356433819ef077a1f5896992c1
parent8fc46c4d42c4e0ab02761dd33a47dc6c06586831
parentfe5db5dc9d9e0ccb58e5ccc83bd50b54a1f2de5c
Merge with 0.6