merge of '1f5a2c36e677453b7935b6a0f72bbb7b0563a1ed'
authorPaul Sokolovsky <pmiscml@gmail.com>
Mon, 12 Nov 2007 16:35:11 +0000 (16:35 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Mon, 12 Nov 2007 16:35:11 +0000 (16:35 +0000)
     and '60eadea31c2dce277f39d64f53efc32a033d3035'


Trivial merge