merge of 5b47c32159e8766b523639396056aa211d4cd410
authorMatthias Hentges <oe@hentges.net>
Wed, 12 Apr 2006 14:40:05 +0000 (14:40 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 12 Apr 2006 14:40:05 +0000 (14:40 +0000)
     and dbb7c9f1cb33a45f5a82203f21c265ae3187199e


Trivial merge