merge of 006ae295fb5a2b06d28233cf442ed2de2d7cdd36
authorGraeme Gregory <dp@xora.org.uk>
Mon, 3 Apr 2006 13:46:02 +0000 (13:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 3 Apr 2006 13:46:02 +0000 (13:46 +0000)
     and dc0a41efce7dadc6c656636252f8b9125bb97517


Trivial merge