merge of 0abc64672fd7bfbde3b0d9aec834bbe1623570b1
authorPhilipp Zabel <philipp.zabel@gmail.com>
Wed, 1 Mar 2006 18:00:47 +0000 (18:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 1 Mar 2006 18:00:47 +0000 (18:00 +0000)
     and 71d2eba1824aa4f45a3d63f7406148b84b342637


Trivial merge