Merge remote branch 'dkg/master'
authorJameson Rollins <jrollins@finestructure.net>
Sat, 16 Jan 2010 00:42:42 +0000 (19:42 -0500)
committerJameson Rollins <jrollins@finestructure.net>
Sat, 16 Jan 2010 00:42:42 +0000 (19:42 -0500)
commit17315937bc0af145ef7dfb749096faad49f208aa
treea4133ce12ec0f7cd291458833e05a11d39d624d5
parent11349dccbc0cb233bd8206897f278f6241c39117
parent94c28acd69a41f5733e3b4d800c755b053ca3449
Merge remote branch 'dkg/master'

Conflicts:
tests/basic
tests/basic