merge of db90e0deb7a031c29d263ee783179a2f9a00c649
authorRod Whitby <rod@whitby.id.au>
Fri, 14 Apr 2006 10:18:59 +0000 (10:18 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 14 Apr 2006 10:18:59 +0000 (10:18 +0000)
commitdb96eaf0375c0458ff4d56f24a73d5ce8067940e
tree4d210f37ce64910fa13ad18b3af4db61267ea56f
parentea0453416e73df34755112cffe35741ef9a65d2e
parent477049f7d437e102149d35e8e6bd1a14181dd5e7
merge of db90e0deb7a031c29d263ee783179a2f9a00c649
     and a07719feb319fd43615902b86aa7a10c6b61d0ba