merge of 21858366d3f1cd69225dc0db2af6109cdd227145
authorMichael Lauer <mickey@vanille-media.de>
Tue, 25 Apr 2006 18:50:58 +0000 (18:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 25 Apr 2006 18:50:58 +0000 (18:50 +0000)
commit276625340e2e1a0a083f59b7e4b82185de3edfce
treee626067979c535bf2e437839d039ccb6376e9d49
parentf6ddfcecd7d51472af0126e9d764c9f7c809ef03
parent03978ed0dbd7b718171cfe8605b65ea4da20a146
merge of 21858366d3f1cd69225dc0db2af6109cdd227145
     and caff9d7758bbac1a8819824a3d56cef092f94ca8