merge of '177ed52042195257c9390eac21052907cfa0c4d0'
authorJamie Lenehan <lenehan@twibble.org>
Fri, 27 Apr 2007 02:06:52 +0000 (02:06 +0000)
committerJamie Lenehan <lenehan@twibble.org>
Fri, 27 Apr 2007 02:06:52 +0000 (02:06 +0000)
     and '39b0c54a5b69e68b9f43900fc5c3fbb6bfcf60a1'


Trivial merge