merge of '818e2a75a7b401d665944a17d67a461550f70977'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 21 Aug 2008 21:50:33 +0000 (21:50 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 21 Aug 2008 21:50:33 +0000 (21:50 +0000)
commit23c0b79836cbadbfbdfa5f63b39815f85d400984
treeff5ebf8ccc5c51e70b91bc41e4c307642facdc9c
parent7ff2c562ce1ac455beeb9867d6d5d253404eb356
parent862c7d370df9ad29d8321c5ca41359b6f95d27f0
Merge ... '818e2a75a7b401d665944a17d67a461550f70977'
     and 'cc7ffb8bc92349fabe61bdc5525f9ce9f58af9b6'