merge of '7247d50baa3969c4328d37f4c560e6b56963636c'
authorPaul Sokolovsky <pmiscml@gmail.com>
Wed, 4 Jul 2007 23:56:59 +0000 (23:56 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Wed, 4 Jul 2007 23:56:59 +0000 (23:56 +0000)
     and 'c1258545caf65ca7330dc5d776336c46135d7d52'


Trivial merge