merge of c49f612c2c8f57536e2e1711896a786e87f9c916
authorRichard Purdie <rpurdie@rpsys.net>
Tue, 4 Apr 2006 21:30:08 +0000 (21:30 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 4 Apr 2006 21:30:08 +0000 (21:30 +0000)
     and e5a38d83b512c0a632ec3bd86a9e8066a38574ce


Trivial merge