merge of 780f2c7ed7d400cab2b423113975b949051ca42c
authorRichard Purdie <rpurdie@rpsys.net>
Sat, 29 Apr 2006 22:07:48 +0000 (22:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 29 Apr 2006 22:07:48 +0000 (22:07 +0000)
     and 8c282fac8c9d0dcbec065a43bbc12cd89384b3a2


Trivial merge