Merge remote branch 'greg/2459'
authorJameson Rollins <jrollins@finestructure.net>
Mon, 4 Oct 2010 05:25:46 +0000 (01:25 -0400)
committerJameson Rollins <jrollins@finestructure.net>
Mon, 4 Oct 2010 05:25:46 +0000 (01:25 -0400)

Trivial merge