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)
commit37ea2a9e29c94ba467bc6a377f81075be65df154
treeaccc6b2f95417998498b02b5af4f5acdaf574cf4
parent5250da19e65393e632dae76a7927f2490c10d202
parenta08e8120c741f2bd5416e6a1de7f9ad988f61ce5
merge of 6b7fc0bd3ea1ea989db0c0fcde52be00258cc1b4
     and b6b5dac89a52611dff217367df3c56f6dceaf55e