merge of '064f6cf6a9c7a0c7bf6771ce35e295ba8a56535c'
authorPaul Sokolovsky <pmiscml@gmail.com>
Thu, 8 Feb 2007 00:48:04 +0000 (00:48 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Thu, 8 Feb 2007 00:48:04 +0000 (00:48 +0000)
     and '68b3b556b8787e3175c7900ad3a0038e45b4f4b8'


Trivial merge