merge of 2310202db82b311ad297541e20f94d8bf5706860
authorKoen Kooi <koen@openembedded.org>
Sat, 11 Mar 2006 18:51:44 +0000 (18:51 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 11 Mar 2006 18:51:44 +0000 (18:51 +0000)
commitb9f6a8ce4b5d017696f0651c5d799d54d8ecbe62
tree36a7babc98ec8d86bc20aeb467e6e56275a3adf3
parente2c415e2d5816bee9ac4c15e2443023877aec027
parent71aef36731d6fd25f3fb41f981e4c6a64bc590ce
merge of 2310202db82b311ad297541e20f94d8bf5706860
     and dfcb7791f0a796aab00f40b7918a67f5022f1d07