merge of 2d74ab18755124460de464b7d2ee0ce76344837e
authorKoen Kooi <koen@openembedded.org>
Tue, 16 May 2006 10:20:18 +0000 (10:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 16 May 2006 10:20:18 +0000 (10:20 +0000)
commit7d97c867f1ae7174c9e31e175aadb09e56494699
tree18883537eac8c9f8ce73d9d14e3ac8c88657c1e1
parent47443d61cbea3bfc3476422f36969be6d81d4d24
parent641ecff78a3222facdc0b527966e7b3ee95123dc
merge of 2d74ab18755124460de464b7d2ee0ce76344837e
     and 398443d538482a6003cb29221382acd4afbde19e