merge of 14a4cb7c17e30cd099536c6ed0417a4550b5e687
authorRichard Purdie <rpurdie@rpsys.net>
Sat, 29 Apr 2006 16:20:34 +0000 (16:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 29 Apr 2006 16:20:34 +0000 (16:20 +0000)
     and 805e846ce6f746ff365641db88c7294e287c7b8b


Trivial merge