merge of '67a0d6fb746dc6576bd8ae2410c1144c785b13d0'
authorStelios Koroneos <skoroneos@digital-opsis.com>
Thu, 6 Sep 2007 05:59:04 +0000 (05:59 +0000)
committerStelios Koroneos <skoroneos@digital-opsis.com>
Thu, 6 Sep 2007 05:59:04 +0000 (05:59 +0000)
     and '6a2d2b93d5aaaeac208513989dea7830e85864d2'


Trivial merge