merge of 222dc41b1f1c9b5ce83af7931aef248aadb739c1
authorPhilipp Zabel <philipp.zabel@gmail.com>
Sat, 10 Jun 2006 15:24:52 +0000 (15:24 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 10 Jun 2006 15:24:52 +0000 (15:24 +0000)
     and 67ed00b33157ce84b6e8ab9d09d8b8816e3e7b53


Trivial merge