merge of '315cbb93869a360f92e32183f8c4dc46ba28faa5'
authorJamie Lenehan <lenehan@twibble.org>
Thu, 7 Jun 2007 12:40:31 +0000 (12:40 +0000)
committerJamie Lenehan <lenehan@twibble.org>
Thu, 7 Jun 2007 12:40:31 +0000 (12:40 +0000)
     and '5e2d15cbe531dc544eb1c04db1880abe0226013f'


Trivial merge