merge of 3af6af596405ee2d8df8c79397157adaf28023b3
authorJustin Patrin <papercrane@gmail.com>
Fri, 10 Feb 2006 04:48:23 +0000 (04:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 10 Feb 2006 04:48:23 +0000 (04:48 +0000)
     and 96b18d585efe43c8bffa43523fa2b70496cc94fb


Trivial merge