merge of '2ca643ff7c613da29d4b700344b527b73f2000f6'
authorPaul Sokolovsky <pmiscml@gmail.com>
Fri, 29 Dec 2006 19:37:19 +0000 (19:37 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Fri, 29 Dec 2006 19:37:19 +0000 (19:37 +0000)
     and '62e4d0ce49681c6de5b9819d261c14fb44919519'


Trivial merge