merge of '5375fc74346cb588fda63467cc2a6d8152472b3c'
authorStelios Koroneos <skoroneos@digital-opsis.com>
Mon, 5 Nov 2007 15:09:52 +0000 (15:09 +0000)
committerStelios Koroneos <skoroneos@digital-opsis.com>
Mon, 5 Nov 2007 15:09:52 +0000 (15:09 +0000)
     and 'f877dae893a9428cb0be862854abd3c3eac0d924'


Trivial merge