Merge branch 'haskellChanges'
authorMichael Welch <michaelgwelch@gmail.com>
Sat, 18 Feb 2012 16:43:05 +0000 (10:43 -0600)
committerMichael Welch <michaelgwelch@gmail.com>
Sat, 18 Feb 2012 16:43:05 +0000 (10:43 -0600)

Trivial merge