merge of 398443d538482a6003cb29221382acd4afbde19e
authorCliff Brake <cbrake@bec-systems.com>
Tue, 16 May 2006 10:52:40 +0000 (10:52 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 16 May 2006 10:52:40 +0000 (10:52 +0000)
commit4720db96d858f1904d62c791a2c5959fcc891dc5
treee4791bdb52ea8efbacee7f4ce6d0cbd91832f244
parent47443d61cbea3bfc3476422f36969be6d81d4d24
parent39deb7c94e862b2c709487fa94ad54bbd3cfc358
merge of 398443d538482a6003cb29221382acd4afbde19e
     and 6cf43463f8980c4949a1dea852d710d362f18ac8