merge of '3d4a85aa2c2724b95dcfd705b2078392bd5fe7fa'
authorStelios Koroneos <skoroneos@digital-opsis.com>
Mon, 28 May 2007 22:26:36 +0000 (22:26 +0000)
committerStelios Koroneos <skoroneos@digital-opsis.com>
Mon, 28 May 2007 22:26:36 +0000 (22:26 +0000)
     and 'd1aa63f3b61dcecf2e8e5a90f2243dc87573d0b7'


Trivial merge