merge of '99133b6a252718e1e4b91a43a3a2dc3b7a6cfbdd'
authorJamie Lenehan <lenehan@twibble.org>
Wed, 30 May 2007 00:02:52 +0000 (00:02 +0000)
committerJamie Lenehan <lenehan@twibble.org>
Wed, 30 May 2007 00:02:52 +0000 (00:02 +0000)
     and 'cfdef5c70cac18e3f976428abe56e3b5461c80e0'


Trivial merge