merge of 51c9e09a8058432d791104e8438490931766eae3
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 28 Jul 2005 14:22:15 +0000 (14:22 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 28 Jul 2005 14:22:15 +0000 (14:22 +0000)
     and 5a333cd4bee97ad57667f94f2f17a96800af8232


Trivial merge