merge of 4f879e69c3075a7f71f282a926dc5d66531e0982
authorRod Whitby <rod@whitby.id.au>
Sat, 21 Jan 2006 13:00:18 +0000 (13:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 21 Jan 2006 13:00:18 +0000 (13:00 +0000)
     and eb951c998c252c9834e0f299a6d9bee237365a2d


Trivial merge