merge of 33f5c37d2f8c2a6f5a242f167516efbcbc9ecf41
authorMichael Lauer <mickey@vanille-media.de>
Sun, 21 May 2006 19:20:44 +0000 (19:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 21 May 2006 19:20:44 +0000 (19:20 +0000)
commit7b58691d3939afaeb888705a142023befcced6e8
treed51176cdc148fd77ed5a8d7cd6e65ab7b03dc11a
parentd33ef936c3c4673112d0fa91a3d9e507b97be663
parente1d33d3cc457eb262b5343f8985e8c5ca3415715
merge of 33f5c37d2f8c2a6f5a242f167516efbcbc9ecf41
     and dbb8f5536fbc6e50532ff14d6db8e58ae21b0398