merge of '4775c58714baf936cab4e2cb0e464e1fb7dd1a73'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 2 May 2007 08:33:40 +0000 (08:33 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 2 May 2007 08:33:40 +0000 (08:33 +0000)
commit00c46ae2b2e759a80bbae6fe9871981e28c46533
treea7e06bd176089a944f694b225222042125edc35c
parent563b9f4daa8a39c20dd7754d5ee32d3583a1e173
parent30258fbbe17abcbf8239830bf4d9c8e3659b829d
Merge ... '4775c58714baf936cab4e2cb0e464e1fb7dd1a73'
     and '4c02388e21857424fa81992ad328d0704f8eee9c'