merge of 6cb03263ec6dc70d88e5694bd4793512b85564eb
authorJustin Patrin <papercrane@gmail.com>
Wed, 31 Aug 2005 23:59:37 +0000 (23:59 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 31 Aug 2005 23:59:37 +0000 (23:59 +0000)
commit28206871f49cf70657f136e73732694abbc606e1
treeac2581fd1c7accb1fa0477f5f6a648251cb97b2c
parentf5caf636a7241c4df7e40699ea37798465670223
parent496a3c45e13bcc0555ea088cc9184fb383f85812
merge of 6cb03263ec6dc70d88e5694bd4793512b85564eb
     and f4c52b5ab6f084f42b43ac432882d7247319c14e