merge of '47274cc0739378c72583716ea1dae1d95e00ec3c'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sun, 7 Jan 2007 15:55:16 +0000 (15:55 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sun, 7 Jan 2007 15:55:16 +0000 (15:55 +0000)
     and 'dea29766b51dad33917d31366a22b9a3cfde2469'


Trivial merge