merge of 6d9a6d263913c8c725780872fe2f13329fcfb1b8
authorMike Westerhof <mwester@dls.net>
Thu, 25 May 2006 05:24:21 +0000 (05:24 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 25 May 2006 05:24:21 +0000 (05:24 +0000)
commitf0b2f4dbe65e29fe5d2acabdfdb3478271939823
treed104767ea53d477789f2454db61b471484011012
parent2e3d6f2d0fe091f0b3442ad217e18d07026125a8
parentcb1f96f7355f53add6ca196a078b577c3d7f07f5
merge of 6d9a6d263913c8c725780872fe2f13329fcfb1b8
     and e974c19c3971f18d2c208cce51bc722e476920be