merge of '75cc5b6d101abaa6d3152ecabd66113e3524b48f'
authorKoen Kooi <koen@openembedded.org>
Sat, 4 Aug 2007 15:49:52 +0000 (15:49 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 4 Aug 2007 15:49:52 +0000 (15:49 +0000)
commitb2b1947eefbde86caac32426bf1af7746e7875b0
treec58e618f27898e3a5e5daab5a5ae9f316f0e3b13
parent3035de27e32116eebe1a9e812e7048c9f49345ad
parent778d291e0869d5ab35252f00d4a4017e4e0cd371
Merge ... '75cc5b6d101abaa6d3152ecabd66113e3524b48f'
     and '97361f57055487168df642f2260c940cb3b6da7f'