merge of 427dc4e4b02069584f06135f74bd23cb80490c8b
authorMichael Lauer <mickey@vanille-media.de>
Sun, 11 Sep 2005 18:07:53 +0000 (18:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 11 Sep 2005 18:07:53 +0000 (18:07 +0000)
commit39c4dfc4f4d95abef3a32cb4197a693d2789b410
tree8f17878acde4c7426a43a79a04224053210aa618
parent19cc4dc12988b78c8bbbaffc7e786f7df386f2dc
parent74ee0fc6dfd7d5b6c8b5762558cbfb99dd52b5fd
merge of 427dc4e4b02069584f06135f74bd23cb80490c8b
     and db10c295cf58e5701efeb931273b72f3ab0dbdd1