merge of 0495eaa1fec4c7cc4ca6223fd48d22ce3718a65b
authorJustin Patrin <papercrane@gmail.com>
Thu, 25 Aug 2005 18:43:57 +0000 (18:43 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 25 Aug 2005 18:43:57 +0000 (18:43 +0000)
commit41800578c1cc79cb3f4c9005a129a69e3501ba90
treea605c04b0745cdaff62becb0245ab993cb443993
parent0b19274db1744fa770a1c4aa5c808c18719b9293
parent40beb1b71e8b8703506436d50f5d1f7893ca23b2
merge of 0495eaa1fec4c7cc4ca6223fd48d22ce3718a65b
     and 92a32d63c25e0613e8a8bf6c1135383137f21b08