merge of 66dc5a29ccb437489e6283f23735e733f97b39ad
authorRichard Purdie <rpurdie@rpsys.net>
Sat, 27 May 2006 11:26:44 +0000 (11:26 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 27 May 2006 11:26:44 +0000 (11:26 +0000)
     and d200e691772c0dcc5ada0b720230a8f49fa7547a


Trivial merge