merge of 24e9a57c16a592bd13ccd1e8cf31feac9a2510a3
authorKoen Kooi <koen@openembedded.org>
Tue, 13 Dec 2005 14:21:19 +0000 (14:21 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 13 Dec 2005 14:21:19 +0000 (14:21 +0000)
commitebfd8bc926fe24a224e7ca2cfd183f810f724044
tree8960afdf7af047a95a6050447f9b03f7ea8a2582
parent56e5a0221fc937f5d0475cd9ce35b165a8ef83a6
parent8413d50d45620133bd77e859e78bf58bf278b329
merge of 24e9a57c16a592bd13ccd1e8cf31feac9a2510a3
     and d4e0f069245e5657ad844349d78d5b45d9e02d3c