merge of '9f20206493b0337a84d74f61b27b34138e7ea9f3'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 14 Jun 2007 15:50:15 +0000 (15:50 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 14 Jun 2007 15:50:15 +0000 (15:50 +0000)
commitd0ef53fabcf86956214e1cbae3f112f6825689bb
tree5a839a884acb2104a70089615a769f3a12951c1d
parenta67730afd1dd499e2486f345f1b8a7a665b8ea7f
parent4370c214334ef399b8b6b0204a7ea63366df4855
Merge ... '9f20206493b0337a84d74f61b27b34138e7ea9f3'
     and 'a0dce4b014a5345488a3702f0af98e5eb36ae053'