merge of '3f545ee3cd1a64b0dba17454c87e0a429236c7e7'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 9 Sep 2008 14:28:57 +0000 (14:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 9 Sep 2008 14:28:57 +0000 (14:28 +0000)
commitb82949797a1a4a917b149200336d5a1d9820e5a5
tree3521ca9c2a46dad71128539876d189f346b9a7a3
parent90a9e2e83b12b354d26150161ee644aa523ca1bc
parenta3639f1f74b2a9e44b9e852202954014d80a6fb4
Merge ... '3f545ee3cd1a64b0dba17454c87e0a429236c7e7'
     and 'd6dadd36c3b5c998171b7bf4c051fe5a2e82eba8'