merge of dc7030746547ed09bdd941871c775b044c145143
authorPhilipp Zabel <philipp.zabel@gmail.com>
Thu, 9 Feb 2006 20:00:25 +0000 (20:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 9 Feb 2006 20:00:25 +0000 (20:00 +0000)
     and f7940d7b4ac1dca8c38ef92949c3d012d70c9202


Trivial merge