merge of '6fd18ecf067a5c1f73730a2278a171f906b7f7c5'
authorPaul Sokolovsky <pmiscml@gmail.com>
Thu, 17 Jan 2008 13:16:53 +0000 (13:16 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Thu, 17 Jan 2008 13:16:53 +0000 (13:16 +0000)
     and 'f7f0ddcdaf7ca93df00d48a93db3f02c7baaba31'


Trivial merge