merge of 2819ed65548adb15c53612a3b51eb7bef109c647
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 4 Aug 2005 15:50:38 +0000 (15:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 4 Aug 2005 15:50:38 +0000 (15:50 +0000)
     and 87f058a530faa6a89df3767295e8e2a5faaa073e


Trivial merge