merge of 32d7375b2a5f945b8a425da76292506a65ac81eb
authorRod Whitby <rod@whitby.id.au>
Sun, 21 May 2006 12:35:59 +0000 (12:35 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 21 May 2006 12:35:59 +0000 (12:35 +0000)
commit405b9c56fd921db33cc33b723145eb0453bf89a8
treefc2ca583ab8c3bce0c0c3ef0dafc8d3b5704183c
parentdcc43c3f171740b96ee4ab0a062e777f9652ea0f
parent83f590bd8e1b243795ef7a9008608bf1225a5bd8
merge of 32d7375b2a5f945b8a425da76292506a65ac81eb
     and cb0c84fd84771c6e5354c1cd86a89fd04cfbced1