merge of 6ba3e310353ca1a6ea62e5f5f11c116d1a1fce6d
authorMatthias Hentges <oe@hentges.net>
Thu, 25 May 2006 15:59:22 +0000 (15:59 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 25 May 2006 15:59:22 +0000 (15:59 +0000)
commit579d6238e817ea11c8b7b09aff2cf36c71027173
treeb9b277fb242bdeb31305852dd875d2c8fb920671
parent9125d5edcf62b504cb876afb8e70fd25ee01d157
parent9a5608bd2dc4af7f2584afcb35057a711270d091
merge of 6ba3e310353ca1a6ea62e5f5f11c116d1a1fce6d
     and f8a273706c3fce0627a1d187a0aa71db62202670