merge of '8e8bab6fb50f5098375feebdb8f5e06408bc3e2e'
authorPaul Sokolovsky <pmiscml@gmail.com>
Fri, 12 Jan 2007 20:04:58 +0000 (20:04 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Fri, 12 Jan 2007 20:04:58 +0000 (20:04 +0000)
     and 'fa0c91a57dfd0c1ecb6d5eeb7b1f12db5973ca2a'


Trivial merge