merge of 6e871c66a3a79d4cb65e5784eace4cb7896df590
authorPhilipp Zabel <philipp.zabel@gmail.com>
Wed, 1 Mar 2006 18:28:10 +0000 (18:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 1 Mar 2006 18:28:10 +0000 (18:28 +0000)
     and f16c11d524e85958fbc2b3ec749e166ed4669741


Trivial merge