merge of 4ad70d03f3a19dce2f2582ea1b294336864413d6
authorRichard Purdie <rpurdie@rpsys.net>
Tue, 4 Apr 2006 21:15:28 +0000 (21:15 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 4 Apr 2006 21:15:28 +0000 (21:15 +0000)
     and f175718fb5bde3e7aeae50739efad8691f30c81a


Trivial merge