merge of '120adbf5e1dc9921cc744af51e0b4877a60d7242'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 31 May 2007 17:37:38 +0000 (17:37 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 31 May 2007 17:37:38 +0000 (17:37 +0000)
commit7427792332ae4bfad2d96926f55aa082e2e9c97b
tree4639c4f4131a1ce10098192615e475c3238eeaa8
parent8da5e6e1f34503a970428c7d3341f41f65979e22
parentf14dae0878cab53639e332fea0d89cbff30f4d40
Merge ... '120adbf5e1dc9921cc744af51e0b4877a60d7242'
     and 'bf1d58054d86a443b45c92dc8fbf509efb9fd64d'