merge of 0aeab38c7b048a94b7c6c7450371d19dd75789fd
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 27 Jan 2006 20:17:22 +0000 (20:17 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 27 Jan 2006 20:17:22 +0000 (20:17 +0000)
     and fe66a2425727029ce88d5665ffd6eee2879ef16f


Trivial merge