merge of 1e5ed75da89ccfd9e2b84471e321a4ef7aea7f14
authorRichard Purdie <rpurdie@rpsys.net>
Tue, 27 Sep 2005 21:25:42 +0000 (21:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 27 Sep 2005 21:25:42 +0000 (21:25 +0000)
commit953a2e110313237a8dc255641eb4f9667ccbf83f
treed33a0d3c41bec27caf595da2f1d47537a4cea855
parent9ad28b642620f06aec2dba2ed1346a2b0c1b9fa2
parent99e167a40af77815b7e854e5c2ead47f1a05c089
merge of 1e5ed75da89ccfd9e2b84471e321a4ef7aea7f14
     and 6c4836f3c8b3446186ac9adbcf4d2dc5c9211f0b