merge of 6b7fc0bd3ea1ea989db0c0fcde52be00258cc1b4
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 28 Jul 2005 11:51:15 +0000 (11:51 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 28 Jul 2005 11:51:15 +0000 (11:51 +0000)
     and b6b5dac89a52611dff217367df3c56f6dceaf55e


Trivial merge