merge of '19e8907fe35a9f46f690201cf752b83fc25cbe4d'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 27 May 2007 12:09:46 +0000 (12:09 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 27 May 2007 12:09:46 +0000 (12:09 +0000)
commit49cc9f5f34beec3014df78590d549632349fc2cf
treec7b3f838270d1caecb13f742a4332d5ef1e1f7e0
parented8a5f1b65020c4a50f8e7d7c9a79961c25df9f0
parenta30543818b99bc9e6ebfbc0d8996e6ca7c28fd26
Merge ... '19e8907fe35a9f46f690201cf752b83fc25cbe4d'
     and '60f25719f044f04c78ec8cfa8af6a503b643df4e'