merge of 'a79e5ae3153847b525489dc6fd0b472b58bd3b17'
authorCliff Brake <cbrake@bec-systems.com>
Mon, 3 Sep 2007 20:31:45 +0000 (20:31 +0000)
committerCliff Brake <cbrake@bec-systems.com>
Mon, 3 Sep 2007 20:31:45 +0000 (20:31 +0000)
     and 'fc1241826299a6a458edf92c52b4d95c0b785dfa'


Trivial merge