Merge trunk
authorMatt Nordhoff <mnordhoff@mattnordhoff.com>
Wed, 6 May 2009 17:29:48 +0000 (17:29 +0000)
committerMatt Nordhoff <mnordhoff@mattnordhoff.com>
Wed, 6 May 2009 17:29:48 +0000 (17:29 +0000)

Trivial merge