merge of 224679d0d1adfe1e36b72ea199644249ab797df3
authorJustin Patrin <papercrane@gmail.com>
Mon, 13 Feb 2006 02:38:48 +0000 (02:38 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 13 Feb 2006 02:38:48 +0000 (02:38 +0000)
     and b8bb8279a60f23addb3b8d68e1bdc2549d5c7f12


Trivial merge