merge of 030151d3784053d0f38b8d3ce7c867b65b9de8be
authorRod Whitby <rod@whitby.id.au>
Wed, 26 Apr 2006 16:37:40 +0000 (16:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 26 Apr 2006 16:37:40 +0000 (16:37 +0000)
commita0f36157c7da268d0e779866e80d3c7278e0d29e
tree5173b0855adbb901c9e21505ad92c4c50e11ebb1
parentd262e4ee9abce549c62fcf8a7654a375851d6af3
parent12d749a064b0f5d15eee64272f457ef0c72d431f
merge of 030151d3784053d0f38b8d3ce7c867b65b9de8be
     and b97fadfd2eab8eb429ad031bc7e591cf3cddc31a