merge of '7f70b7fae9dd73e5dff956eceeaff2fd624fae5c'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sun, 7 Jan 2007 02:10:02 +0000 (02:10 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sun, 7 Jan 2007 02:10:02 +0000 (02:10 +0000)
     and '906e7dac3aac70f45f2eba65022520465bb7e942'


Trivial merge