merge of 1fc6af6fa0872867517c8ef7f00e8dca1179d3a1
authorMatthias Hentges <oe@hentges.net>
Sun, 23 Apr 2006 14:32:27 +0000 (14:32 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 23 Apr 2006 14:32:27 +0000 (14:32 +0000)
     and 7e6704734e3ec153d3d38d9715cc735bcbaff9d6


Trivial merge