merge of '3eac26db70c312053491f643dc9df91f03c13be2'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Tue, 19 Jun 2007 14:01:26 +0000 (14:01 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Tue, 19 Jun 2007 14:01:26 +0000 (14:01 +0000)
commit6eb9fb1974cdb1c94a60ffa422e9aa3af65cf116
treedbe2c13616f9955f737c0455f03972f150bb07a9
parent4b67df106972f6e79b815eb305ed94609ed71e77
parent2340b33c5bb2e4206f9c35114a0bcbac711345d7
Merge ... '3eac26db70c312053491f643dc9df91f03c13be2'
     and '86eacc43ad1d11e9d0f9fd2bf034da287c974ffe'