merge of 44ef2a80f1407b2958e8f750892482362d9bb352
authorRod Whitby <rod@whitby.id.au>
Mon, 28 Nov 2005 20:31:23 +0000 (20:31 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 28 Nov 2005 20:31:23 +0000 (20:31 +0000)
commit24715af7cd33bf4e50bc1fa0c50348938bacc928
treea57973e388e8f17f105d843e9d4d0bd25eccbeb6
parent0dd6ab7a56866cbedbcba43115530ff9e42b86e5
parent4e7ade7c5ebbdca9c9c57a2dcda1fba71944897d
merge of 44ef2a80f1407b2958e8f750892482362d9bb352
     and d6ed8bd922639d616c17c01d270e9edf2bc6b517