merge of 2d6f8bd4b71a9ad4cd46736ff74dcf0bae763780
authorErik Hovland <erik@hovland.org>
Wed, 24 May 2006 18:56:25 +0000 (18:56 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 24 May 2006 18:56:25 +0000 (18:56 +0000)
commit6db44b3bfd1f07a773ad03e28d6d4b88d0b0dfc2
tree3da7a3f2512ec16ee5bd7d43ceb53a2a12ee0482
parent2e3d6f2d0fe091f0b3442ad217e18d07026125a8
parent2b82709ff01a6f234554f2c952c1123c3fea17d7
merge of 2d6f8bd4b71a9ad4cd46736ff74dcf0bae763780
     and 6d9a6d263913c8c725780872fe2f13329fcfb1b8