merge of c62fafe15a2128a24d3cea02d65d8f8df34adcbb
authorRichard Purdie <rpurdie@rpsys.net>
Tue, 9 May 2006 15:47:18 +0000 (15:47 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 9 May 2006 15:47:18 +0000 (15:47 +0000)
     and f37e3f4dc6cffd5d558b57237c19f6d7072bf495


Trivial merge