merge of 'aa2c7cca9146ef3910ca2f5ea908bc240fc478f9'
authorKoen Kooi <koen@openembedded.org>
Fri, 16 Feb 2007 15:39:35 +0000 (15:39 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 16 Feb 2007 15:39:35 +0000 (15:39 +0000)
commit07a6653bf7bbdd46124368760eddfe47393ee0a3
tree755617e38e2c734e9828009e58d81abcfac348d2
parent0783e6ddda9b17f429d3e077668196c8161ac4b6
parent1e37747e5b6b1edf55ddd01569752866f8e679dd
Merge ... 'aa2c7cca9146ef3910ca2f5ea908bc240fc478f9'
     and 'b866b8272d34e10f3efd115e1dbb79b5287031e9'