merge of '091511591b5d369f5f183c5300585f7f1b3ca830'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 13 Dec 2007 12:47:08 +0000 (12:47 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 13 Dec 2007 12:47:08 +0000 (12:47 +0000)
     and '3b98f460ed46650308bc3b880e26e161dd49d432'


Trivial merge