merge of '38a08f997602a09b164ab9864452b19c00f8ceed'
authorJamie Lenehan <lenehan@twibble.org>
Sun, 10 Sep 2006 02:05:26 +0000 (02:05 +0000)
committerJamie Lenehan <lenehan@twibble.org>
Sun, 10 Sep 2006 02:05:26 +0000 (02:05 +0000)
     and 'c6bcfdb59d3237f59868cab3ac70dcc8c36efa5a'


Trivial merge