merge of 46718e780d11f8632344968041941f51627340d0
authorRod Whitby <rod@whitby.id.au>
Sun, 8 Jan 2006 01:15:22 +0000 (01:15 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 8 Jan 2006 01:15:22 +0000 (01:15 +0000)
     and e7247df479a65586544743faa8ad71fd9c94be77


Trivial merge