merge of 3bc4777e54539885e842fcbb48be4faf5b6f0183
authorJamie Lenehan <lenehan@twibble.org>
Sat, 27 May 2006 23:03:13 +0000 (23:03 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 27 May 2006 23:03:13 +0000 (23:03 +0000)
commit1561250669e6936528f37596e6ccbbcb7b4206cc
tree6daa0af0cc0654f02742a2cce7955b859fffafb1
parentb97f58bb6a349de1e1aa6013e3370b7a8eda47da
parent2d752121f1326807b0d4dcbb9fac432cd82158e7
merge of 3bc4777e54539885e842fcbb48be4faf5b6f0183
     and faf532c4c96ee2f44be6339cdc67fc8f9be0d0ac