merge of 0484063486563010f0662099c9c6084d75e9a806
authorMichael Lauer <mickey@vanille-media.de>
Thu, 30 Jun 2005 19:31:26 +0000 (19:31 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 30 Jun 2005 19:31:26 +0000 (19:31 +0000)
commit3c70c93b93b743f5fd1127278ae4d49fa4b82036
tree75779710f5384e2d5b8c6b58134dc52ac6114eb7
parent0cfb22e016c01a84573531cb445f0085613df024
parent04e00dd9f42896e05b50751343b1926a80a4c66d
merge of 0484063486563010f0662099c9c6084d75e9a806
     and 3ecad514c5b23dc2516ed2bb95995f476a1075ac