merge of 1ba5e5da6f959068ba57d3ec6046c21ca621cd8c
authorKoen Kooi <koen@openembedded.org>
Mon, 5 Sep 2005 18:22:38 +0000 (18:22 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 5 Sep 2005 18:22:38 +0000 (18:22 +0000)
commit54d81f8399200687d5f6d7dafa5cace76da00680
treea69ad0b8221d1f26035c4851cc7d792a1a530eb2
parent0585adfa0aacaa71cb78011dd67082581ee5e776
parent4b32b72efdd7bec54bfb9bdd22ce97070c91fab1
merge of 1ba5e5da6f959068ba57d3ec6046c21ca621cd8c
     and 21490fb90785cccbb3926c5fc9a7adf67d89e0b0