merge of 69d638b1c6e39bce739575e34e87d6fbc5e3b092
authorMatthias Hentges <oe@hentges.net>
Sun, 23 Apr 2006 15:08:29 +0000 (15:08 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 23 Apr 2006 15:08:29 +0000 (15:08 +0000)
commit9bdb9dba1ae820afc40494807a4a1d19ca707b03
treefc4cd4a572115a0356bf96f3da2440bbfdb9b0f3
parentad60e878ca53b67bc97f66fd5b38e7e7aa2047c4
parent25c3f29eae34ff0b250ca6757362dada9e426278
merge of 69d638b1c6e39bce739575e34e87d6fbc5e3b092
     and d6d71105ea3c3b1274c6490f7ef981c3dd519f13