merge of '57f7077b81d445e3b77f5f1a68139c49a941d322'
authorCliff Brake <cbrake@bec-systems.com>
Thu, 7 Feb 2008 14:44:31 +0000 (14:44 +0000)
committerCliff Brake <cbrake@bec-systems.com>
Thu, 7 Feb 2008 14:44:31 +0000 (14:44 +0000)
     and '5fa2d6d4dc3460b9e5308630c744b1a3207595bf'


Trivial merge