merge of 7312b6306cd878588176ce2cc0a31e4d0edc4e5a
authorMichael Lauer <mickey@vanille-media.de>
Sun, 18 Jun 2006 17:04:56 +0000 (17:04 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 18 Jun 2006 17:04:56 +0000 (17:04 +0000)
commiteaa20353c4019c5decb223dc24048f1cd9ae6893
tree57fb6a32a317c5dca4f197bf7faa5ba98876ecc1
parent6eede856b500b4d501daa411935b349dcc63f10b
parent74d4fe2a1cbd0ba2456e08256b22b5dde9403024
merge of 7312b6306cd878588176ce2cc0a31e4d0edc4e5a
     and ba21f1faf99a465ffb1326139936cb5b957c10b3