merge of 1fe9f8d43389439ccd8569c7e3d656fdc6e01b36
authorPhilipp Zabel <philipp.zabel@gmail.com>
Fri, 14 Jul 2006 09:27:02 +0000 (09:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 14 Jul 2006 09:27:02 +0000 (09:27 +0000)
     and e67478401de677e4d3ab4253e5a93d4478cd694d


Trivial merge