merge of 0ff64394ec8e55a962dae7598429db658db92ce8
authorMichael Lauer <mickey@vanille-media.de>
Fri, 12 Aug 2005 14:01:29 +0000 (14:01 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 12 Aug 2005 14:01:29 +0000 (14:01 +0000)
commitdf2f2bf4c05e30fa369fbf8cc3de0f2569208fc6
tree6efaf197753da2783a5e81b47207f94f43439732
parentfbfb5b4608244162d40320f09352b2694a1c2cfe
parentdd4f457d598720f5520b08203e1e5e570b81765b
merge of 0ff64394ec8e55a962dae7598429db658db92ce8
     and 7d7503a076b2aa004a780c9f24769124a939d7df