merge of 45a5427b6f0cf6bd9348091b9a3207186c8f7ec2
authorMichael Lauer <mickey@vanille-media.de>
Tue, 25 Apr 2006 21:49:21 +0000 (21:49 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 25 Apr 2006 21:49:21 +0000 (21:49 +0000)
commitff1fd2fd17597638dcb65ff7010d26e3d9a63154
treea88fbb02b2d0265e8639dc19a4d386cb4ca44688
parent0addba49b257008c63a9c64beafd1778bd0c70f8
parentf395b13afb05ca83e1df51b3c58062a44bd59d0a
merge of 45a5427b6f0cf6bd9348091b9a3207186c8f7ec2
     and 8ece4b6d66be2e1540ebb969513da31e4970d3a0