merge of 29e32c2404ac0652c35da25df65b8cd7a45e5a53
authorRichard Purdie <rpurdie@rpsys.net>
Mon, 24 Apr 2006 22:46:23 +0000 (22:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 24 Apr 2006 22:46:23 +0000 (22:46 +0000)
     and 3b17b4991e8525f70b7a59e472412f0bb1850939


Trivial merge