merge of '48e3d8ce0c21c80e6e929a3a992826251eed2f4d'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sun, 2 Dec 2007 17:51:14 +0000 (17:51 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sun, 2 Dec 2007 17:51:14 +0000 (17:51 +0000)
     and 'd3dfa43eb653664a9ed9a5ae97b24949fee1c9cf'


Trivial merge