merge of 311e1d1fc2eefa2efc02e72f033f7f8ff3d1099b
authorKoen Kooi <koen@openembedded.org>
Thu, 11 May 2006 17:22:12 +0000 (17:22 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 11 May 2006 17:22:12 +0000 (17:22 +0000)
commitbb2d992e4bbff033b0233d2f6076c7d90a3b6a2b
tree73e1e2d78f20d5c5e3152f7b90ce20f131e8a730
parent3df2dc0637af5f35a4a043edda91f89578e1c024
parente42e19276711783047e5e75bacca2dae5dc2f3fd
merge of 311e1d1fc2eefa2efc02e72f033f7f8ff3d1099b
     and ea43be5f9ba4797b6cf391313e04bfb636e692db