merge of '8ac202a78f871b27cbe2d26c6da77233a43fac2e'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sun, 14 Jan 2007 10:23:41 +0000 (10:23 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sun, 14 Jan 2007 10:23:41 +0000 (10:23 +0000)
     and 'a7bb5ea8a47a4cd4ddcdbe8e75c0a59d492f1ee8'


Trivial merge