merge of e74c73570c2c682aebf3f9050ed959e4f615d79e
authorRod Whitby <rod@whitby.id.au>
Sun, 17 Jul 2005 13:15:49 +0000 (13:15 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 17 Jul 2005 13:15:49 +0000 (13:15 +0000)
     and efd8c005871477b3c2788c1257799459527dd028


Trivial merge