merge of '1f5c493b4303e65b05567cdcc737645e2cff5227'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sun, 7 Jan 2007 06:52:27 +0000 (06:52 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sun, 7 Jan 2007 06:52:27 +0000 (06:52 +0000)
     and '56b3e4d13290394304aabe91089b40748c1c9e48'


Trivial merge