merge of '8ccf578d98540e0fe880015d1158e3f2e2d5fada'
authorPaul Sokolovsky <pmiscml@gmail.com>
Wed, 4 Jul 2007 17:58:00 +0000 (17:58 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Wed, 4 Jul 2007 17:58:00 +0000 (17:58 +0000)
commit529c3cb8561d06ade5b58a9b439f7c88781b009f
treeb8d745a204fce126c2b7c4f093a215b6d1082be1
parentd8f8c8ae824998c9e7b886f0a6c3e0488e998cde
parent84d9f6f516ca1c5a001c959b7565fbb63c041c33
Merge ... '8ccf578d98540e0fe880015d1158e3f2e2d5fada'
     and 'ffc6a1cb8a5c35ab9fdca8add26efc64679665b5'