merge of 45908085bdceb2276493e588d8d89daba46b6d5c
authorRod Whitby <rod@whitby.id.au>
Mon, 22 May 2006 01:48:53 +0000 (01:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 22 May 2006 01:48:53 +0000 (01:48 +0000)
commitfe19b81b064bb612a85b11ac1b3ee8b40a7a72be
tree3a4d0e8a051d7c05529a917730f9efa1c7394ede
parent405b9c56fd921db33cc33b723145eb0453bf89a8
parenta6e39080788cf30c6d71977fae4ca2bf1e7bde8c
merge of 45908085bdceb2276493e588d8d89daba46b6d5c
     and ec1cfabe499e84bf5627a49cc40bae42b557c638