merge of '06538476a57a7ec542febb49515ebf5c936fe6de'
authorJamie Lenehan <lenehan@twibble.org>
Sat, 18 Aug 2007 11:20:49 +0000 (11:20 +0000)
committerJamie Lenehan <lenehan@twibble.org>
Sat, 18 Aug 2007 11:20:49 +0000 (11:20 +0000)
     and '930c3cb990617ba61f08fd6fc4371224b675d4ab'


Trivial merge