merge of 42b169fabe3df723d70a1502561f5848f1287a98
authorPhilipp Zabel <philipp.zabel@gmail.com>
Thu, 22 Sep 2005 14:08:21 +0000 (14:08 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 22 Sep 2005 14:08:21 +0000 (14:08 +0000)
     and a7038c05fef716879570b18652c839a87a2a65f8


Trivial merge