merge of '1baac115ff1ee3cfa594ac8bdb5a672342a18c6b'
authorKoen Kooi <koen@openembedded.org>
Fri, 14 Mar 2008 10:00:58 +0000 (10:00 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 14 Mar 2008 10:00:58 +0000 (10:00 +0000)
commitc7cf564fa87a947ef5b5ff835a4d7c3ea40dc5f9
tree6e02272ad829810b8cea8ad5246d62a0dcad8f4c
parent5c378c487e256f1a11cffabf9403346a527704f3
parenteae9a1ecd8003375e1fc89ee5fec803998384abf
Merge ... '1baac115ff1ee3cfa594ac8bdb5a672342a18c6b'
     and '3d41c4823011988b4e4758eb112e35cca8f29b7f'