merge of 5ef8750d9a69c84b19f6d9bf623a45342b0b07b5
authorJustin Patrin <papercrane@gmail.com>
Fri, 30 Sep 2005 18:02:30 +0000 (18:02 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 30 Sep 2005 18:02:30 +0000 (18:02 +0000)
     and e965f050d16d0a1cfe49ed571b5f989a6b66b121


Trivial merge