merge of 2e6f4fc5b24b571067b1137624e2b534da044e21
authorMatthias Hentges <oe@hentges.net>
Sun, 26 Mar 2006 16:54:38 +0000 (16:54 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 26 Mar 2006 16:54:38 +0000 (16:54 +0000)
     and 4aa63ccabe96771d4c4363d6c68ebc597fd1c378


Trivial merge