merge of 0cbb13c94d1d354d5287fb1b304b348fa2003d0c
authorRod Whitby <rod@whitby.id.au>
Fri, 11 Nov 2005 02:56:05 +0000 (02:56 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 11 Nov 2005 02:56:05 +0000 (02:56 +0000)
     and a21672eaa3285e42fbfeefbb8e1bd68923c357e9


Trivial merge