merge of 28fad962593d54a4267010cb31794718c949df3f
authorPhilipp Zabel <philipp.zabel@gmail.com>
Wed, 22 Feb 2006 16:29:36 +0000 (16:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 22 Feb 2006 16:29:36 +0000 (16:29 +0000)
     and df057ead9d792826178866c1676a8c21d7fdce29


Trivial merge