merge of '14d71b936216a80a0008bcd3d669f6c38fd5d0a6'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 12 Feb 2007 03:40:10 +0000 (03:40 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 12 Feb 2007 03:40:10 +0000 (03:40 +0000)
commit312b7a20c3eafba35731d900a1705b353d7ab425
tree5d3786f9cdf64ce5abe3289c1354178e50eb9f0e
parent5572e1f2a11806acc21a7ab8113f34a1e662eafa
parent74a7abd209a8708d512f9b36e3f3e0414932cfad
Merge ... '14d71b936216a80a0008bcd3d669f6c38fd5d0a6'
     and '79d9268d43556f55360ba162dc5f949422a1079b'