merge of 5a11cecc6df40454f52ac963fdc178b273327c14
authorPhilipp Zabel <philipp.zabel@gmail.com>
Wed, 24 Aug 2005 18:58:04 +0000 (18:58 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 24 Aug 2005 18:58:04 +0000 (18:58 +0000)
commitf9d0f8c79905d4c1d848890713a9be6b892830b6
tree8f4a7f1557ef8410d7889f66b7eada49a936a2dc
parentefab019e257e5bdec759536887d565a0f5a825e6
parentb031c22b002b8d5e57d46ad6f80cd8b4ab44bfb9
merge of 5a11cecc6df40454f52ac963fdc178b273327c14
     and 74801abfe9e66d4dbdeb7f2ac609b79f663a8558