merge of 1d77ddb01c67323571ab7dbd94f8697e79915a6c
authorPhilipp Zabel <philipp.zabel@gmail.com>
Wed, 24 Aug 2005 19:37:43 +0000 (19:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 24 Aug 2005 19:37:43 +0000 (19:37 +0000)
commit44b21ada29515bef4ce6ebd3ce33eebe99370043
treedd0ea6b034ce128155c4666cb2c0ce4e9b03f4c2
parent504ee24ca6fe600c0d2586d78aa9ad8b17510f14
parent4df9d82ef3a8f9a66fe18fd65340c289b4de8cc2
merge of 1d77ddb01c67323571ab7dbd94f8697e79915a6c
     and ef94291fe767aba5f533204f38ff66f144dba2ff