merge from master
authorKevin Rosenberg <kevin@rosenberg.net>
Fri, 29 Jan 2010 23:53:33 +0000 (16:53 -0700)
committerKevin Rosenberg <kevin@rosenberg.net>
Fri, 29 Jan 2010 23:53:33 +0000 (16:53 -0700)

Trivial merge