merge of 862947fc7ef9b740fb666cce1351ba7df1cf9ca8
authorMichael Lauer <mickey@vanille-media.de>
Sun, 11 Jun 2006 15:33:31 +0000 (15:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 11 Jun 2006 15:33:31 +0000 (15:33 +0000)
commit2ffed0587ede52e317c6ba328555b9c8225d2ab4
tree1da163bfb7ebd889e288580d931896fdb1374b72
parentf83e494a6e96dbfb04f4bece2c19be3c455cad72
parent8286c83cd5d7714c7432fd867ac72c59eed12ebf
merge of 862947fc7ef9b740fb666cce1351ba7df1cf9ca8
     and e07cef00a7e452974d1c0ccfec2dea932a539ade