merge of 0352b5e5aba6317167740a3467df40a576fd6d54
authorRod Whitby <rod@whitby.id.au>
Sat, 7 Jan 2006 05:58:15 +0000 (05:58 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 7 Jan 2006 05:58:15 +0000 (05:58 +0000)
     and 128236d8140e77e43ae65c14a618fef3451a7618


Trivial merge