merge of '3d0230efac5fabe1406f43ab6c934c0589c097c4'
authorPaul Sokolovsky <pmiscml@gmail.com>
Wed, 20 Jun 2007 18:40:29 +0000 (18:40 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Wed, 20 Jun 2007 18:40:29 +0000 (18:40 +0000)
commit1e60b24d1f272b416ba3249152c3a66be32704b1
treedd3c76c9f6438f582289c1776f18fccb403ae040
parent7ecaae4deab799c25b1378784673f7bc3985c67f
parentdf155b90c6862f3dc760897ab5abb78ef6f1cfc8
Merge ... '3d0230efac5fabe1406f43ab6c934c0589c097c4'
     and 'c664220a4c8dabbd9e38f326462046a367cad18e'