merge of '2b681d4d3c3fb23e8f08c334e16c595fa671c384'
authorPaul Sokolovsky <pmiscml@gmail.com>
Fri, 27 Jul 2007 21:06:40 +0000 (21:06 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Fri, 27 Jul 2007 21:06:40 +0000 (21:06 +0000)
     and '96a6f6c247b7609c9627fb805d843b72b9067a82'


Trivial merge