merge of 397e16c7ee39422a928815c8f39b1d8aa619daec
authorMichael Lauer <mickey@vanille-media.de>
Thu, 16 Feb 2006 23:25:57 +0000 (23:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 16 Feb 2006 23:25:57 +0000 (23:25 +0000)
     and 5964138bce1427aaaa36a1953c3090063a8da2de


Trivial merge