merge of 041417bf35ad25ac46b7b36aa80c5aecc3f947c2
authorRichard Purdie <rpurdie@rpsys.net>
Mon, 4 Jul 2005 22:27:41 +0000 (22:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 4 Jul 2005 22:27:41 +0000 (22:27 +0000)
     and 8f8edb0b14c6c17472c27e61765ff13f441ff89b


Trivial merge