merge of 'd283e920162c9ff5c4a3392010a4376d56a02b3c'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 16 Feb 2007 04:31:54 +0000 (04:31 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 16 Feb 2007 04:31:54 +0000 (04:31 +0000)
commitf0c79817df40871bc27a5668c95da41f4a2eff09
tree297570b4a3aab9cc846e668712052c0a0426d5b0
parent342f01d322bcc1ee34549fdc8f8db7555568b329
parent75f39ca295443f2a448c077b65be29855aecc6a9
Merge ... 'd283e920162c9ff5c4a3392010a4376d56a02b3c'
     and 'ff4a9eec58fba61dc8cafa4957305ccd0140430a'