merge of 301eec9b699901af861fb29a8cebbe1e1b608b1f
authorMichael Lauer <mickey@vanille-media.de>
Wed, 7 Sep 2005 14:26:25 +0000 (14:26 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 7 Sep 2005 14:26:25 +0000 (14:26 +0000)
commita4d1e2b034e26206bf1929a7b2cda1a1a5c4187e
tree65194680945a8cc92effb65cf6c6fcaef6f97585
parentc81cadd8d3a0e5e12b569e8a924cc00e7c6fde1d
parentd8c4503a3a4d1595833ebc6171df5ac1cd03b3df
merge of 301eec9b699901af861fb29a8cebbe1e1b608b1f
     and 692e8d4a1e59eedb7b14074d84e2c5438e48808d