merge of 253db2cc1289b54dcf638e5bd3cd11ae2a9c432f
authorKoen Kooi <koen@openembedded.org>
Sat, 4 Mar 2006 15:52:58 +0000 (15:52 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 4 Mar 2006 15:52:58 +0000 (15:52 +0000)
commite8251f5ecd1459bb5b25c622514324f133485986
tree86d5a9bd4394f15842fa7b2c91685ac20f2adc67
parent102787f045e2858cb45032291b52ece55f893d4d
parent0afc9678f57e1832a0c2d995637fcc7cfa59ce2a
merge of 253db2cc1289b54dcf638e5bd3cd11ae2a9c432f
     and bee378ef0bf8d72ae3f2f94a19b1ed5b0b2f95f4