merge of '69101672fb51bbd0ee154a122221e376599481cc'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sun, 13 Jan 2008 11:42:53 +0000 (11:42 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sun, 13 Jan 2008 11:42:53 +0000 (11:42 +0000)
     and 'bad02fc028d55fbb82c52c9bffe4bbfebf92fb83'


Trivial merge