merge of c2b2b886ea84df92ea854ebb40c0d1c1bcc8b756
authorRichard Purdie <rpurdie@rpsys.net>
Thu, 27 Apr 2006 18:58:01 +0000 (18:58 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 27 Apr 2006 18:58:01 +0000 (18:58 +0000)
commit63b01b53a8d4d9d148afd144b94ecb5839d0143e
treeddd8275789a9af3a42c7ade845d0ee9723027b55
parentbc55050886bd05cac03a20a1fa84e3aedc7a547d
parent2767b74af00b301e80fdfcfcdc4eaf08ccc20b22
merge of c2b2b886ea84df92ea854ebb40c0d1c1bcc8b756
     and f5cd7ec006a5ec5b566f8ee3cc2552418899e9d1