merge of 12ad312536380ea2dc9169b7d73257f999484105
authorJustin Patrin <papercrane@gmail.com>
Tue, 7 Feb 2006 22:19:05 +0000 (22:19 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 7 Feb 2006 22:19:05 +0000 (22:19 +0000)
commit10da525f08277902dfccc92a7310e7d337a9d626
treea1b6b2028333978d72f72bbea23819af5cebe9e3
parentf87411938dc0ada555c14c609d632f817842db9a
parent517adf9b4db1c1427d4e1884a688e4c842a94971
merge of 12ad312536380ea2dc9169b7d73257f999484105
     and 21ab572cc3967a02344791cb310b14cf5beb5d4f