merge of '66515f98e31cf98acf25d9bfff293b724c9f4ee9'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sun, 30 Dec 2007 20:39:16 +0000 (20:39 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sun, 30 Dec 2007 20:39:16 +0000 (20:39 +0000)
     and '80fc38ee9d6f114931833ab38ed2ca078ea5e043'


Trivial merge