merge of 91b0af10527652528b88682f4fc9a481225a11c2
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 21 Jul 2005 12:21:02 +0000 (12:21 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 21 Jul 2005 12:21:02 +0000 (12:21 +0000)
     and 94cddacf22ffc551b677a753431bbc33fa3b8b44


Trivial merge