merge of '5198d0edcd376472b37b08e632a08466f101c570'
authorRod Whitby <rod@whitby.id.au>
Fri, 7 Sep 2007 21:27:53 +0000 (21:27 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 7 Sep 2007 21:27:53 +0000 (21:27 +0000)
     and '83398e1336b5456cc5a8661377b3819a02cc3ba2'


Trivial merge