merge of '8827e908a98c3d0805a10db96eda80f5d5e29cd8'
authorRod Whitby <rod@whitby.id.au>
Fri, 1 Dec 2006 11:40:34 +0000 (11:40 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 1 Dec 2006 11:40:34 +0000 (11:40 +0000)
commit3d90c4bd302eddeff2cbf9fc089244b0d4e74ea3
tree2be5c94e227a8d85469c147003049ec2893b7fbf
parentb0ac405f45f9ea2d48e07b05647ee58d9fc9657a
parent2d22931664f17a2bc9655f72cea36fe37c0b0e82
Merge ... '8827e908a98c3d0805a10db96eda80f5d5e29cd8'
     and 'fb24b0f3b51e2ab57fb4f0291af7e4c6e178b0da'