merge of '062f11ac5a659cd78342432c3122546e10111fd2'
authorStelios Koroneos <skoroneos@digital-opsis.com>
Mon, 5 Mar 2007 18:56:10 +0000 (18:56 +0000)
committerStelios Koroneos <skoroneos@digital-opsis.com>
Mon, 5 Mar 2007 18:56:10 +0000 (18:56 +0000)
     and '6063cf44a481655f8a16b617ebc5c4c29b541718'


Trivial merge