merge of 87e4f0da031411c350745ff1cd9325a82c7c3cb9
authorJustin Patrin <papercrane@gmail.com>
Sun, 15 Jan 2006 05:45:44 +0000 (05:45 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 15 Jan 2006 05:45:44 +0000 (05:45 +0000)
commit47cde1bfb6658f5464862c4cf362fac5f5e90cda
tree5a4aa2f1592da8cac7cabd1d13950aed58cb403e
parent42985047a476cf2ba4e4a27cdc5a4f7ee2756e19
parentbbf67faea13558e9ad23b6faca2c0745630f8939
merge of 87e4f0da031411c350745ff1cd9325a82c7c3cb9
     and e08e5d284b9c3633dc77b46afcf0f14fd5cab232