merge of '070533cbb8f39d9306bbc120371891e171775516'
authorStelios Koroneos <skoroneos@digital-opsis.com>
Tue, 23 Oct 2007 09:41:03 +0000 (09:41 +0000)
committerStelios Koroneos <skoroneos@digital-opsis.com>
Tue, 23 Oct 2007 09:41:03 +0000 (09:41 +0000)
     and 'f695654d2676f4d969fd509c4b4e96172463fbe2'


Trivial merge