merge of 92a452f12d8cc21518953fccb816b6da6d8cbfb6
authorGraeme Gregory <dp@xora.org.uk>
Wed, 8 Mar 2006 15:08:15 +0000 (15:08 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 8 Mar 2006 15:08:15 +0000 (15:08 +0000)
     and e5ee771a5576db06a02a6c49061082909e18705e


Trivial merge