merge of '29c3523123b5b4cd06600394ae12aa149df07c8a'
authorRichard Purdie <rpurdie@rpsys.net>
Tue, 19 Feb 2008 12:38:55 +0000 (12:38 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Tue, 19 Feb 2008 12:38:55 +0000 (12:38 +0000)
commit45076191cdf0d532353d3c8aee59f864e0c9e119
tree29c9704e9cf79bedf6888212cccaeda730f36856
parenta566027593bbace5286e39ed258b6ecf4c3888e4
parent7592cf0d864ce7c2c2ba2ed7b3140c4549497677
Merge ... '29c3523123b5b4cd06600394ae12aa149df07c8a'
     and 'c9d03a40dbab3e176a210a0dd6f1204d9ae94f49'