merge of 38811a337536b285df71efc4a3eb4cdb3f911310
authorPhilipp Zabel <philipp.zabel@gmail.com>
Wed, 25 Jan 2006 21:44:26 +0000 (21:44 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 25 Jan 2006 21:44:26 +0000 (21:44 +0000)
commit2b4554235a3451616714b4a4c1ae88ed80fa50ea
treeab9c408de10444e0831bdde0f605a391ac00b05b
parent473d27b3de6f4c3e302116279fcc44613d800ff5
parenta5994e0470d907e5a35c36af4eaad10bd3fd7ed2
merge of 38811a337536b285df71efc4a3eb4cdb3f911310
     and b8a8ab513bcf0fd86ab534ece626c74e6b41b41d