Merge pull request #6 from daisieh/bug_3380
commit92f72dd2e1e8f81378aa47c0c55e10aca7e9033c
authorChris Fields <cjfields@illinois.edu>
Wed, 29 Aug 2012 03:22:04 +0000 (28 20:22 -0700)
committerChris Fields <cjfields@illinois.edu>
Wed, 29 Aug 2012 03:22:04 +0000 (28 20:22 -0700)
tree0e070f96ffc77679ce055035ea880aae70169069
parent3afccf9e86ec90e9525df476bc3037c6491de683
parenta552dc35fda01cfa0c31f2f779cfae3614aa8c25
Merge pull request #6 from daisieh/bug_3380

Fixes for bug 3380