merge of 43210f598efbfe0448fd76adff3e7c54597c1238
authorMatthias Hentges <oe@hentges.net>
Sun, 21 May 2006 11:54:58 +0000 (11:54 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 21 May 2006 11:54:58 +0000 (11:54 +0000)
     and 9f0cf5f918714fddd0ea186781b4d1a4ffc876bd


Trivial merge