merge of 17b5ed09da5a4cdb493874b746d2586d5ba53c86
authorMichael Lauer <mickey@vanille-media.de>
Sat, 20 May 2006 18:31:50 +0000 (18:31 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 20 May 2006 18:31:50 +0000 (18:31 +0000)
commit61a3368e962e14767ccbd4f24456b362bedbfdd2
tree365738e7b61ac4c5ed95e64876acc334490c54f7
parentf89ded6650e53252ce92bb12072a47f63badc918
parent5dc648ea9c4ff5e7976f17459dc2fb685fcebc26
merge of 17b5ed09da5a4cdb493874b746d2586d5ba53c86
     and 8d5e1a3025b2da6e7d30136891450c13c77eacfe