merge of '7d861d6a945af531929902d5717003486976079d'
authorRod Whitby <rod@whitby.id.au>
Sat, 1 Dec 2007 14:46:35 +0000 (14:46 +0000)
committerRod Whitby <rod@whitby.id.au>
Sat, 1 Dec 2007 14:46:35 +0000 (14:46 +0000)
     and 'e01f270130b45051b21882abdc8e136007852697'


Trivial merge