merge of 56fcd51a5519d87459da0ba3141d8169ba0edbfa
authorPhilipp Zabel <philipp.zabel@gmail.com>
Sat, 14 Jan 2006 18:33:40 +0000 (18:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 14 Jan 2006 18:33:40 +0000 (18:33 +0000)
     and 921456ec31911d2697ddd0502ad4dce2c8cc618f


Trivial merge