merge of 80eff09c5e9d2b1404eef22e530ed430302e8875
authorRod Whitby <rod@whitby.id.au>
Sun, 31 Jul 2005 19:15:56 +0000 (19:15 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 31 Jul 2005 19:15:56 +0000 (19:15 +0000)
     and ea728072febab8471c31add474a18b864de00bfe


Trivial merge