merge of 7674b5cefa1bffe23d1d22a95d2a3e5632799f08
authorRod Whitby <rod@whitby.id.au>
Sun, 24 Jul 2005 09:23:28 +0000 (09:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 24 Jul 2005 09:23:28 +0000 (09:23 +0000)
commit0e4507a78da1a3e593de26a10f683cf7549f7fd8
treed010aa9d19d791146df3d54ac26560e22b5320c1
parentf2e1da7559d1798ae8314d8824c8d53da0b3506b
parent00e189f558429b6917f02a28eab2e08cf68c3e31
merge of 7674b5cefa1bffe23d1d22a95d2a3e5632799f08
     and 7f183da4475115f7bfd62b35a7c733fe4fd59258