merge of 59522ce91cdb430a3bf5ac208b9486b4cdb66d0d
authorPhilipp Zabel <philipp.zabel@gmail.com>
Wed, 21 Sep 2005 09:15:27 +0000 (09:15 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 21 Sep 2005 09:15:27 +0000 (09:15 +0000)
     and e1b2e8e447769fbcf97f076e87be6da4168640a8


Trivial merge