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)
commit14249e6918312ed80afc70eb467bb236ed1d04cf
treed5c3b1ab8182343c3b3a6ddac9770603b7ff61ec
parent88c8d2e89dba6fc6b9834bf1a7eb74dcb9c19281
parent1bcd28884cdf8e17ae667db24117dfd757d7654c
Merge ... '23a59cebf92d573927159e3645cf0a49afe3efcd'
     and '2744a73f652e4b8cd70f2bd64ec980972854ad0e'