merge of 718895e358e441c13f030839cde1f2afd9525837
authorRod Whitby <rod@whitby.id.au>
Mon, 24 Apr 2006 20:46:00 +0000 (20:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 24 Apr 2006 20:46:00 +0000 (20:46 +0000)
commit3bb07b1bb372d80c0c0ae48440b7312650082340
tree60843deecd1137c2cca20c4d21ccbc5a11177670
parent81865b679ed90e840a7b03bcb1e6e19b1003d9cc
parentce04f81f47b8c0296e0bd6f92502e748741f2088
merge of 718895e358e441c13f030839cde1f2afd9525837
     and ac0211db57ef3b498cdc5cc32344b9c2073b87d4