merge of 0bda2d2be880e8f2511362475ca94c7fccbe18db
authorMichael Lauer <mickey@vanille-media.de>
Sun, 11 Jun 2006 08:58:17 +0000 (08:58 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 11 Jun 2006 08:58:17 +0000 (08:58 +0000)
commite741e9d602b4c17a83d5f46358f041b076f19360
tree16d70087deac328a29b79c8acea8cb8134d8a604
parent44d425781d950fc09c4d3df318e2c1b0bb31eab0
parentafc983b7bfc91509981d3fa1071a90b46e0e0296
merge of 0bda2d2be880e8f2511362475ca94c7fccbe18db
     and 21e0b3e6f31b3802c08eabc0c9c109ae745596a0