merge of '68c1dba00e182241b1e887487fb3c8271f9c0d01'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sun, 23 Sep 2007 00:38:29 +0000 (00:38 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sun, 23 Sep 2007 00:38:29 +0000 (00:38 +0000)
     and '954ad99909199c0ef7c0d21819dce8c20cf40c64'


Trivial merge