merge of 8a43dee8ce4339a21d375fb72ec7706a829cef00
authorPhilipp Zabel <philipp.zabel@gmail.com>
Tue, 20 Sep 2005 14:13:12 +0000 (14:13 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 20 Sep 2005 14:13:12 +0000 (14:13 +0000)
     and 90f04a5e9de8096f2eb5360bb468659cf0211a0d


Trivial merge