merge of 36cb9cba2fd4c56a699cbd4285642c1a6f1fa710
authorMichael Lauer <mickey@vanille-media.de>
Mon, 10 Apr 2006 13:40:38 +0000 (13:40 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 10 Apr 2006 13:40:38 +0000 (13:40 +0000)
commit23570f7c70ef5d8f523a6e3a43ebe339c6307fc8
tree0ab75252417707fb4627f780bc8427dde521ed78
parentd4e50db68aab6287fa731414851dd5204cd6c3ef
parent8926967b79f553fe94e16c691114b32124d335db
merge of 36cb9cba2fd4c56a699cbd4285642c1a6f1fa710
     and 6412fbc6b6ef09f97014f02c61ab03c743c2e265