merge of 837efe3aeefce257370adc69dbcdf6e0b338c5c5
authorMatthias Hentges <oe@hentges.net>
Mon, 20 Feb 2006 23:09:34 +0000 (23:09 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 20 Feb 2006 23:09:34 +0000 (23:09 +0000)
     and e5ea68d755d504fc5cf25c69893b45235adfeaa2


Trivial merge