merge of '0de79e77116c042b92a36942f9817043f9ee16d1'
authorRod Whitby <rod@whitby.id.au>
Wed, 19 Sep 2007 21:30:50 +0000 (21:30 +0000)
committerRod Whitby <rod@whitby.id.au>
Wed, 19 Sep 2007 21:30:50 +0000 (21:30 +0000)
commit951a7a17adf3fcc85efa653703ecf955cda552c8
treef731913edc4e794f40cea0048cbafbb99add259f
parentdf3d0775db1ad3459bddcf9db1b28a7b87c28997
parentd240e1b714b68d8d1cd0bdc2521d4b1b87ec68c6
Merge ... '0de79e77116c042b92a36942f9817043f9ee16d1'
     and 'a8f3bafcb48eddb52c9b4c0eae2518264f20ea14'