merge of 0acfb1eebc2f685a59a9682d0c0ca5f04720f21a
authorMichael Lauer <mickey@vanille-media.de>
Fri, 19 May 2006 21:08:13 +0000 (21:08 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 19 May 2006 21:08:13 +0000 (21:08 +0000)
commitf192ae2bcc6cf2161071c9b31450feb715f7f2e7
tree1689ea9ff84364c7446ded397e64df5eb02ab093
parent45c5c307ca47b2a33c07ca459092294fe33a8c1a
parentcb5660d3a28e9d8e0b67866781f78f250c371994
merge of 0acfb1eebc2f685a59a9682d0c0ca5f04720f21a
     and 7dfb32275ca87df4dc04d3f00b404e30e92e677a