merge of 32d700ed29f263f43a84f4a55a5cead4c12d033f
authorMichael Lauer <mickey@vanille-media.de>
Tue, 6 Jun 2006 21:06:31 +0000 (21:06 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 6 Jun 2006 21:06:31 +0000 (21:06 +0000)
commitbb51887c6fd1ed22c19c32e4b755345649e7623d
tree9d76f46e9f787d28bea85b794d9fb412e71d0c48
parent99ed929bdf5a4fa648cbf5339ff7ae3b206a0e67
parenta072b606633f34ac647d49a735713d5a0a4cc9dc
merge of 32d700ed29f263f43a84f4a55a5cead4c12d033f
     and ad154a8528a3434623dd460bc473c8f854d9ed45