merge of 5b0f4b84adef041cf78ecdf5c1a735acd5deac13
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 16 May 2006 17:50:37 +0000 (17:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 16 May 2006 17:50:37 +0000 (17:50 +0000)
     and 967ebf04581082d47dec89329e39eacdd1c6a0f7


Trivial merge