merge of 464cb51e4f1333becda8dfa1ccf4f9bbcea5514f
authorJustin Patrin <papercrane@gmail.com>
Fri, 13 Jan 2006 18:26:10 +0000 (18:26 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 13 Jan 2006 18:26:10 +0000 (18:26 +0000)
     and b3735f13f3bb7c2565ab1e628c79b04596773c15


Trivial merge