merge of 6cbed502eb1ed26562c8c85a641f2c046d0a4f70
authorFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 16 Jan 2006 22:15:59 +0000 (22:15 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 16 Jan 2006 22:15:59 +0000 (22:15 +0000)
     and ad95dcf752605087d27c256e46709c87817b0ff0


Trivial merge