merge of 1323e1df6038dca4973ee3bea9b6d558e7ce8fba
authorJustin Patrin <papercrane@gmail.com>
Wed, 18 Jan 2006 17:07:05 +0000 (17:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 18 Jan 2006 17:07:05 +0000 (17:07 +0000)
commit2dc9ee48f37e5ccbf2b7220911c270baa7bcd170
tree013d47bb76421c75b2a7a01d281cbfc852b650de
parentf28138ea966f7852229736197c34b416f2ba450c
parent8d60e06669abb89149ba60248ee6b72b6a274f04
merge of 1323e1df6038dca4973ee3bea9b6d558e7ce8fba
     and 72f8be28da1900bbf98ed7cc1fa244d3cd750692