Merged up with build.
authorMonty Taylor <mordred@inaugust.com>
Sun, 10 Jan 2010 06:39:39 +0000 (22:39 -0800)
committerMonty Taylor <mordred@inaugust.com>
Sun, 10 Jan 2010 06:39:39 +0000 (22:39 -0800)

Trivial merge