merge of c7620f4faaa4b7b9a2f58272644e99ef17e66c9c
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 18 Jan 2006 11:00:53 +0000 (11:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 18 Jan 2006 11:00:53 +0000 (11:00 +0000)
     and b78c38c1ca7715097407f79c1f432372e7b8c258


Trivial merge