merge of 264f8902da57233dad1ce1345495ca9e2fa6e2d4
authorRichard Purdie <rpurdie@rpsys.net>
Mon, 28 Nov 2005 21:05:03 +0000 (21:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 28 Nov 2005 21:05:03 +0000 (21:05 +0000)
     and 4fb1223f75836093b262b92d3533307a1300b174


Trivial merge