merge of 56f0ea6b2b447969899f4758a5a538eba3f2b44c
authorAdrian Davey <ade@beth2.org>
Tue, 20 Dec 2005 12:17:52 +0000 (12:17 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 20 Dec 2005 12:17:52 +0000 (12:17 +0000)
     and 70d8a72ef31e0d28a2da35ba944c64a5e5d9d7fb


Trivial merge