merge of 'a9c9105b2420d6026d79f2b77fa7eb73930cff52'
authorCliff Brake <cbrake@bec-systems.com>
Tue, 3 Apr 2007 21:39:19 +0000 (21:39 +0000)
committerCliff Brake <cbrake@bec-systems.com>
Tue, 3 Apr 2007 21:39:19 +0000 (21:39 +0000)
     and 'f7d9e1a50f12f3f293d480aaf59f86a126e02262'


Trivial merge