merge of 2e715e0002b1abd606680bde1f426f3384e1863a
authorMichael Lauer <mickey@vanille-media.de>
Sun, 26 Mar 2006 22:28:25 +0000 (22:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 26 Mar 2006 22:28:25 +0000 (22:28 +0000)
     and b2304690cc6d600f6d72f824769d026ba7fbe63c


Trivial merge