merge of '848e56fa546fe4f9defbbca37a6baee4fab0c6fc'
authorPaul Sokolovsky <pmiscml@gmail.com>
Thu, 20 Dec 2007 22:12:12 +0000 (22:12 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Thu, 20 Dec 2007 22:12:12 +0000 (22:12 +0000)
     and 'b0214fe2d462308558a4fdd18ac2097bc53e51b2'


Trivial merge