merge of 55cbddab59b09643a3b63cc4ee2b0e3868e00881
authorKoen Kooi <koen@openembedded.org>
Wed, 3 May 2006 18:35:37 +0000 (18:35 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 3 May 2006 18:35:37 +0000 (18:35 +0000)
commit59a67e65a62f1fd7f39122ae9d61cf17438d7870
tree70539ae05d2d9b8dfd316449305dd5afbfa15168
parentf62d2de0dd6507969fc8d08c2308392b1f275914
parentafe088dc3559e2ea5ffed51ed5edd1d4b2948e5d
merge of 55cbddab59b09643a3b63cc4ee2b0e3868e00881
     and 84f88bab5876bb87db120d773bcb36301a59313f