Merge from Mikki
authorBrian Aker <brian@gaz>
Fri, 27 Nov 2009 22:05:12 +0000 (14:05 -0800)
committerBrian Aker <brian@gaz>
Fri, 27 Nov 2009 22:05:12 +0000 (14:05 -0800)

Trivial merge