merge of 6c892a12e5ecbf776b1486325e3502f44bfbee00
authorMichael Lauer <mickey@vanille-media.de>
Fri, 26 May 2006 12:56:04 +0000 (12:56 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 26 May 2006 12:56:04 +0000 (12:56 +0000)
commite5357d974467d9751a375d8db6d52ee98eeb180e
tree81dd474ec294c998fbef29aa7b885d2ddce1885b
parentf4223494e69d4c3fb61ea068619363ed67987ef6
parent8a06d3deaa7c6f7144d031c3b2142e5e69cff6b9
merge of 6c892a12e5ecbf776b1486325e3502f44bfbee00
     and a28eb0331581874fd47b01b78e86dc73b0c99fcd