Merge local development branch
authorTravis Reitter <treitter@gmail.com>
Fri, 4 Dec 2009 06:01:45 +0000 (22:01 -0800)
committerTravis Reitter <treitter@gmail.com>
Fri, 4 Dec 2009 06:02:09 +0000 (22:02 -0800)

Trivial merge