merge of '9549dfd1394792797ed243c1084dd74eb06e0a07'
authorPaul Sokolovsky <pmiscml@gmail.com>
Wed, 6 Feb 2008 18:06:14 +0000 (18:06 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Wed, 6 Feb 2008 18:06:14 +0000 (18:06 +0000)
     and 'e3a0b976e81e239f3e4c4df1b80d11e5c10e367f'


Trivial merge