merge of '0d1b152adad503ee4fb6161676fa61801c45d2f0'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sat, 18 Nov 2006 05:04:42 +0000 (05:04 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sat, 18 Nov 2006 05:04:42 +0000 (05:04 +0000)
     and '8430e1837c1383ef45ac9fbadba2042d39f06c0d'


Trivial merge