Merge commit 'dkg/master'
authorJameson Graef Rollins <jrollins@phys.columbia.edu>
Sat, 25 Oct 2008 19:02:54 +0000 (15:02 -0400)
committerJameson Graef Rollins <jrollins@phys.columbia.edu>
Sat, 25 Oct 2008 19:02:54 +0000 (15:02 -0400)
commit8473500c66d561b6b8a317d93199f5e653dd8980
tree1dac8b29593be74e6074f4be6be54173f56bac09
parent2983d63efb6371cf7dc8815bfcdbefb42cadb1d3
parentbb75d35fb6705d8a75b88af30274703ca84d45f2
Merge commit 'dkg/master'

Conflicts:

tests/basic
tests/basic