merge of 3ce032bdbeb30a4564e65dddfa419c4802edb0e8
authorGraeme Gregory <dp@xora.org.uk>
Fri, 5 May 2006 23:18:53 +0000 (23:18 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 5 May 2006 23:18:53 +0000 (23:18 +0000)
     and 3d04ea60ec78bcaf5d3e5cd76d99e92c3b6c0885


Trivial merge