Merge pull request #39 from daisieh/bug3331
commit87dbcf529f204d7eec29ff098bc182c166a22e97
authorChris Fields <cjfields@illinois.edu>
Fri, 24 Aug 2012 21:54:13 +0000 (24 14:54 -0700)
committerChris Fields <cjfields@illinois.edu>
Fri, 24 Aug 2012 21:54:13 +0000 (24 14:54 -0700)
treeb3cd612b55abc1e1de95074d9845bbc6fbddff76
parent2134908a46ccc15cdb60b82e44a9e0b964bd25d9
parentf7b9e38b1060738f9b7f8eede659f084de73d169
Merge pull request #39 from daisieh/bug3331

Merging in @daisieh commits