merge of 34633137c0dcdd46422c42e3058d55cd967590bd
authorGraeme Gregory <dp@xora.org.uk>
Sun, 29 Jan 2006 20:45:46 +0000 (20:45 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 29 Jan 2006 20:45:46 +0000 (20:45 +0000)
     and dde70ffa9a39c0416ae2875c26c72ab5016c8850


Trivial merge