merge of 691f0a578002a1d669bfbee72d4a577ba19f5509
authorJustin Patrin <papercrane@gmail.com>
Mon, 22 Aug 2005 20:50:44 +0000 (20:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 22 Aug 2005 20:50:44 +0000 (20:50 +0000)
commit5099863a47319b3cb63dd56c98ce7829826834f1
treed21807472ee666cc04fc3f122e737166b3489380
parent15327f6dce227ddd18ac4a0da40ffe72e509df0d
parentd0ba354bb113dbbbe4794ec97138c374f24d4d40
merge of 691f0a578002a1d669bfbee72d4a577ba19f5509
     and c456324f80138ac3564996d0741d738f1fafa406