merge of '10c20f13828f71806f4d990010db22c15e357aee'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 14 Jan 2008 14:15:43 +0000 (14:15 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 14 Jan 2008 14:15:43 +0000 (14:15 +0000)
commit2580c38251bb895f164adfdee448be48974d7b7c
tree59699cfeed9d5b578a72e42d9a1c2557d0f3a0ba
parentef9bb6be18022cc530a4a11200c0221ebe69f4e2
parent595b98ce67c19695ab525ad4f22833887fc7545c
Merge ... '10c20f13828f71806f4d990010db22c15e357aee'
     and 'fcb60e20d2bda504bfd7af6775c815a4c014185e'