merge of '030e4469b1b9b06a2653e1b2c5a505fe0a234237'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 9 Jul 2007 23:50:17 +0000 (23:50 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 9 Jul 2007 23:50:17 +0000 (23:50 +0000)
commitaea39d877bb582c8b076106ae543f699ce3372a4
tree4e414061d26141bab968bf9b1d1fac742c8f656b
parenta3edb19e82ee290b21c46d1b6b9c8f73bb8931e9
parente3f996992e8b57c6d3e11faa237ac2a8bcba3f39
Merge ... '030e4469b1b9b06a2653e1b2c5a505fe0a234237'
     and '3ab017d5460e18f9bb41bc07ddc69e86c27508c6'