merge of b3ded1d1eaac41e7a59ad4e07fd2a62bc82b7a19
authorFelix Domke <tmbinc@elitedvb.ne>
Wed, 6 Jul 2005 12:36:59 +0000 (12:36 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 6 Jul 2005 12:36:59 +0000 (12:36 +0000)
     and fa48cd9d3221468ab0ec41034ddca13ed9a726c4


Trivial merge