merge of 1d5096723ae55a2facbdf4127204dbc5db3b220f
authorRichard Purdie <rpurdie@rpsys.net>
Sun, 19 Mar 2006 17:00:27 +0000 (17:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 19 Mar 2006 17:00:27 +0000 (17:00 +0000)
     and cb0dad155770a3169e567722b7aa898d536f7e35


Trivial merge