merge of 21d01652e3aa40ef6aef3a3bc47a1d618d24501d
authorPhilipp Zabel <philipp.zabel@gmail.com>
Sun, 12 Mar 2006 15:38:16 +0000 (15:38 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 12 Mar 2006 15:38:16 +0000 (15:38 +0000)
     and 344ea81de10e1b863ad4c83421c41c9cb8680f36


Trivial merge