merge of '36f0001388b19933061250f41562b86f34973e35'
authorPaul Sokolovsky <pmiscml@gmail.com>
Thu, 3 May 2007 16:01:23 +0000 (16:01 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Thu, 3 May 2007 16:01:23 +0000 (16:01 +0000)
     and 'a8e33b18fba6f355cb7c0e040f323614af56708e'


Trivial merge