merge of '36827e88b7d0394a63c9f1f96bd021aa80fd443c'
authorRichard Purdie <rpurdie@rpsys.net>
Wed, 29 Nov 2006 12:19:17 +0000 (12:19 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Wed, 29 Nov 2006 12:19:17 +0000 (12:19 +0000)
commitabe440b3722a6cecef27b786783a8e434d6d32de
treeae3fcae9f12aecd59c906872f95980b5e208bfc8
parentfe3c35c38eb7676ba7db56c29b64fec5510af2db
parent45e84e1e16a4f6adae35c692665dc1edf9e3c729
Merge ... '36827e88b7d0394a63c9f1f96bd021aa80fd443c'
     and 'f48c65e31adb332378372f7b45393669354ca0f4'