merge of '23a59cebf92d573927159e3645cf0a49afe3efcd'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 27 May 2007 17:26:37 +0000 (17:26 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 27 May 2007 17:26:37 +0000 (17:26 +0000)
     and '2744a73f652e4b8cd70f2bd64ec980972854ad0e'


Trivial merge