merge of 141bf23dcf6e128a2155bf385cf3dc153be58cbb
authorGraeme Gregory <dp@xora.org.uk>
Fri, 22 Jul 2005 09:40:50 +0000 (09:40 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 22 Jul 2005 09:40:50 +0000 (09:40 +0000)
     and e2b4fef7a158b3669ddc135bad1d8b23c7a59015


Trivial merge