merge of 5b0c87dfefec47f10f9612971a5e7d096e958d8b
authorRod Whitby <rod@whitby.id.au>
Fri, 14 Apr 2006 06:41:25 +0000 (06:41 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 14 Apr 2006 06:41:25 +0000 (06:41 +0000)
     and bf0b47a698b3ec5b7378374bc16f3680fdcf22a5


Trivial merge