merge of 'c1c21b6edac931e6bde28bbc1eed48613645766f'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sat, 6 Jan 2007 19:10:26 +0000 (19:10 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sat, 6 Jan 2007 19:10:26 +0000 (19:10 +0000)
     and 'e6925e9d1207a04d21f3399a43475752ba53d076'


Trivial merge