merge of a2b0044ddbc5e9879532d74eecb9262016190544
authorRod Whitby <rod@whitby.id.au>
Sun, 30 Oct 2005 02:16:14 +0000 (02:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 30 Oct 2005 02:16:14 +0000 (02:16 +0000)
     and fe983f69120d3f09263cea771643b29b9a70785f


Trivial merge