merge of '6a73c5c1eb38e3cc78e63a37f3471f4cc581b27b'
authorRod Whitby <rod@whitby.id.au>
Sun, 25 Mar 2007 05:35:59 +0000 (05:35 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 25 Mar 2007 05:35:59 +0000 (05:35 +0000)
     and 'ea9eb1ab8940b614ef5bbd25f1275174941d1e40'


Trivial merge