merge of 606273dce3a98e6ee0f49b8f1b1fd6e0c7589de4
authorRichard Purdie <rpurdie@rpsys.net>
Sat, 4 Feb 2006 16:24:40 +0000 (16:24 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 4 Feb 2006 16:24:40 +0000 (16:24 +0000)
     and c9a508bd5e793702701e7c831135d1881474b0fa


Trivial merge