merge of 1c3f5d84b51552d7b6e9729979f4fd8da7deceb1
authorJustin Patrin <papercrane@gmail.com>
Tue, 30 Aug 2005 18:31:54 +0000 (18:31 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 30 Aug 2005 18:31:54 +0000 (18:31 +0000)
     and 8457b71bad4cfb28c762765d33e5ab6b8434afa9


Trivial merge