merge of '51d0f00ea24bf874bc2c6cba6bc21afbfaf45752'
authorRod Whitby <rod@whitby.id.au>
Mon, 10 Dec 2007 07:43:38 +0000 (07:43 +0000)
committerRod Whitby <rod@whitby.id.au>
Mon, 10 Dec 2007 07:43:38 +0000 (07:43 +0000)
commit5432e5aaaebf76d10117f8204f28df88a34c5f60
tree2420298bb0cede9f812ad654a4c0204fcfad5628
parentf7ccf1dc2e13a6a08ee4a79cde39ad8bdc99a7a7
parentb64f01dc39be34519d0c6c165475707356b528f5
Merge ... '51d0f00ea24bf874bc2c6cba6bc21afbfaf45752'
     and 'f972c41c1f6486c101e57f2c1ab5b141b3e90e91'