merge of '17cf14623c223d8cb74b50235967b61c1e9945f7'
authorStelios Koroneos <skoroneos@digital-opsis.com>
Sat, 29 Mar 2008 12:00:47 +0000 (12:00 +0000)
committerStelios Koroneos <skoroneos@digital-opsis.com>
Sat, 29 Mar 2008 12:00:47 +0000 (12:00 +0000)
     and '6ed033b5ebd18217b767c79c336455c89d8808cd'


Trivial merge