merge of '23aaca50b161d66de0dd1f96937010f0ad1f1f54'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sun, 7 Jan 2007 00:54:13 +0000 (00:54 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sun, 7 Jan 2007 00:54:13 +0000 (00:54 +0000)
     and '6fde327bd56320660fd115cc20e7a12e7379867d'


Trivial merge