Merge commit '0.99.2'
authorJohn Wright <john@johnwright.org>
Thu, 29 Dec 2011 00:50:50 +0000 (16:50 -0800)
committerJohn Wright <john@johnwright.org>
Thu, 29 Dec 2011 00:50:50 +0000 (16:50 -0800)

Trivial merge