merge of '094e9bfdecc01f2d12a93a7a0063b2cf030b7670'
authorRod Whitby <rod@whitby.id.au>
Sun, 27 Jan 2008 11:06:16 +0000 (11:06 +0000)
committerRod Whitby <rod@whitby.id.au>
Sun, 27 Jan 2008 11:06:16 +0000 (11:06 +0000)
     and 'd2c5e48f5e8d93985cad4428d9ea88e583e8667d'


Trivial merge