merge of 1aee6898e54c0e2037c99cd8999670a4fe1c0c02
authorGraeme Gregory <dp@xora.org.uk>
Tue, 4 Jul 2006 15:16:25 +0000 (15:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 4 Jul 2006 15:16:25 +0000 (15:16 +0000)
     and 348eb2d8dd45b73446471873775d8e248e67bd32


Trivial merge