merge of '19b628fe5b8cb6344e5f3362266f45985cfee2a6'
authorPaul Sokolovsky <pmiscml@gmail.com>
Thu, 14 Feb 2008 14:25:53 +0000 (14:25 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Thu, 14 Feb 2008 14:25:53 +0000 (14:25 +0000)
     and '75f2dc6b3a783a084bf013ce7dc072992561a9bd'


Trivial merge