merge of 5f1164894dc4b3fa10915980e3c3b47c0d316fe2
authorRichard Purdie <rpurdie@rpsys.net>
Mon, 24 Apr 2006 22:50:46 +0000 (22:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 24 Apr 2006 22:50:46 +0000 (22:50 +0000)
     and ece77b91b5c58e4e6897ebb3c0142cd8509797aa


Trivial merge