merge of '253548a9fef0f4eda716e6b0611bae50c0fc4eb3'
authorJamie Lenehan <lenehan@twibble.org>
Wed, 2 May 2007 02:15:12 +0000 (02:15 +0000)
committerJamie Lenehan <lenehan@twibble.org>
Wed, 2 May 2007 02:15:12 +0000 (02:15 +0000)
     and 'da7866de083247553abfdcab2457e49e772484f7'


Trivial merge