merge of 20102c595555b6f10738ef4a8f639e4f90345415
authorRod Whitby <rod@whitby.id.au>
Sat, 9 Jul 2005 13:34:15 +0000 (13:34 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 9 Jul 2005 13:34:15 +0000 (13:34 +0000)
     and 841f6095e2634754c040515b151d9b5e84e3dcb8


Trivial merge