merge of '33aafdfbe4ad64468264a01024f5d9da3794ae04'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sat, 22 Dec 2007 13:21:53 +0000 (13:21 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sat, 22 Dec 2007 13:21:53 +0000 (13:21 +0000)
     and 'd3486b4ff2eccd9818a0e6a56a50e123c6528dfa'


Trivial merge