merge of '6d811ac107aadf1d105bf5af985162ee4955637b'
authorPaul Sokolovsky <pmiscml@gmail.com>
Thu, 3 May 2007 06:51:18 +0000 (06:51 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Thu, 3 May 2007 06:51:18 +0000 (06:51 +0000)
     and 'c97b8005b2f1a28eefa9f9d303214fa1a70e9db5'


Trivial merge