merge of 9ec15bcfc4d260277ec3a62af4079f3fccba496f
authorRod Whitby <rod@whitby.id.au>
Sat, 30 Jul 2005 16:25:28 +0000 (16:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 30 Jul 2005 16:25:28 +0000 (16:25 +0000)
     and b1ad57ce7e9bdcbffb51efed051a46a0435d5999


Trivial merge