merge of 048984452e3625e7ebd5e99419f289d1ea6a9d40
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 4 Jul 2006 09:47:33 +0000 (09:47 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 4 Jul 2006 09:47:33 +0000 (09:47 +0000)
     and b160064c666a513a6ec76f7fd0ddbd5ee1d7a985


Trivial merge