merge of '6b94c6eeda0e3ff2069f19a1f393df67d80bebe9'
authorRod Whitby <rod@whitby.id.au>
Fri, 30 Nov 2007 12:37:26 +0000 (12:37 +0000)
committerRod Whitby <rod@whitby.id.au>
Fri, 30 Nov 2007 12:37:26 +0000 (12:37 +0000)
commitafe44a1b179786201362ed9c5a9e3cb93ba5d88f
treef9caf9035c3d753b90b1daf3233baadbb405f0bd
parente2eeb4244cee6d046602182b4d9c95bbfb18ba80
parentdf583e53b537df5d9becc184789d641ec0788c11
Merge ... '6b94c6eeda0e3ff2069f19a1f393df67d80bebe9'
     and 'f7531c375389681cc06ea3169fea009301b94267'