merge of '1fcb4397e75d4b13986e7e533fff7f96d28a61a6'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sat, 6 Jan 2007 16:50:49 +0000 (16:50 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sat, 6 Jan 2007 16:50:49 +0000 (16:50 +0000)
     and '56ee7562b89eaa857deee8d58c89d3336a00dc93'


Trivial merge