merge of '0d9bd56d97ada159199c80422a743fbaa437a818'
authorPaul Sokolovsky <pmiscml@gmail.com>
Tue, 1 Jan 2008 21:50:19 +0000 (21:50 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Tue, 1 Jan 2008 21:50:19 +0000 (21:50 +0000)
     and '7c47cd537d8cebaa3111aa836db24534a39b5ed9'


Trivial merge