merge of 46a3490245fc8234a2a3cf3dea9bf7c79bb7c851
authorRod Whitby <rod@whitby.id.au>
Wed, 7 Dec 2005 22:01:24 +0000 (22:01 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 7 Dec 2005 22:01:24 +0000 (22:01 +0000)
     and 8183e5d9f7ede3a50afeceb17ef486ccbc630bec


Trivial merge