merge of b0b409a47fdbf9ac358337e7b92f39a6ee431b32
authorKoen Kooi <koen@openembedded.org>
Sun, 11 Sep 2005 11:03:30 +0000 (11:03 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 11 Sep 2005 11:03:30 +0000 (11:03 +0000)
commit92c55d15f42c1ac7fffe9aab73291a9a1d93987c
tree4030f289c0e245db7111e3a8d351b4c7fb9baa63
parentc4908341aaec292bd80d42bf57754fa9dfb598cc
parentf7d88a362a4f0096ef5df0c4a97efa20c78f7b4b
merge of b0b409a47fdbf9ac358337e7b92f39a6ee431b32
     and f87c918cac822cb9dfdfeda16a60f2a5a662d716