Merge branch 'doug'
authorwycats <wycats@gmail.com>
Sun, 20 Jun 2010 05:29:55 +0000 (22:29 -0700)
committerwycats <wycats@gmail.com>
Sun, 20 Jun 2010 05:29:55 +0000 (22:29 -0700)

Trivial merge