merge of 339acd78a0048095d63604cf15366e8bc0e87d60
authorRod Whitby <rod@whitby.id.au>
Mon, 5 Dec 2005 18:21:27 +0000 (18:21 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 5 Dec 2005 18:21:27 +0000 (18:21 +0000)
commit386066aa42d543e3916be0bebcf5ff38efda5400
tree3e0954e0f3a74a8332ca104841e1d7fac310e642
parent562df0bb4d206422c0e403f5223cd0416f2fadbc
parent2b1a9b11bfdfae3518f7a91936a60b7d8f69e114
merge of 339acd78a0048095d63604cf15366e8bc0e87d60
     and 5b5b8b71487defdcc39752dd5f29638b15be8a3d