merge of 93a7ad23db8afae5e3440a5866caf7bf2f8ee416
authorKoen Kooi <koen@openembedded.org>
Thu, 18 May 2006 14:08:12 +0000 (14:08 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 18 May 2006 14:08:12 +0000 (14:08 +0000)
commit7de629c98ed2ff64d21e3faeaddf9086b06b452e
tree111d7dc5c19a05babc4af65e2306826035c2ca40
parent772aa9db9968495b238c7394ca2b1310b93589fd
parent1dfe6a3d89e15e0f8bb09570ec7e887a948d86b9
merge of 93a7ad23db8afae5e3440a5866caf7bf2f8ee416
     and e2cc7febcaa769d78c69fc489e6318305e12313d