merge of 94dc534986dc5c018c2c127e01fa7cac5f51270a
authorRod Whitby <rod@whitby.id.au>
Fri, 13 Jan 2006 23:00:25 +0000 (23:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 13 Jan 2006 23:00:25 +0000 (23:00 +0000)
     and d64372f18fedb4c3445dc88accadfe7e01613642


Trivial merge