merge of 7134dba3d19d7e37fe8d91b2eb4472f07be7a583
authorRod Whitby <rod@whitby.id.au>
Mon, 24 Apr 2006 21:49:48 +0000 (21:49 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 24 Apr 2006 21:49:48 +0000 (21:49 +0000)
commit24b92e71deb0c42ee148c8444aefe287b2ae4575
tree4cb8ef2a7c2b2e68fe2978a60d029c7d7609ed90
parent4e26080bb916add505a12ebbf67a30236b481c76
parent51edae770376aae6af699fb95ab80c798a0e6700
merge of 7134dba3d19d7e37fe8d91b2eb4472f07be7a583
     and d8df52a582560aaab0778576a0d57ac53e65acdb