merge of e1a4a6a54101a12142258575aaa1bcea126adbcb
authorFlorian Boor <florian.boor@kernelconcepts.de>
Sun, 3 Jul 2005 15:50:32 +0000 (15:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 3 Jul 2005 15:50:32 +0000 (15:50 +0000)
     and 9b0371bf5547d5dcea1bcd07f29bc1aceefcdd98


Trivial merge