merge of '3aba2971138df7aa582ac37918b74312095155a5'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 16 Apr 2008 18:11:58 +0000 (18:11 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 16 Apr 2008 18:11:58 +0000 (18:11 +0000)
commit8eca48dd5d75340b7bb4f6c1db3c6eae71efa73e
tree10105aa680bef79dedc21122947866fb5bb0d90a
parent36853e693ecc7f39708c8e19b0ad255ef83bf6d0
parentb63321a1b405538e9cb5f2e925bb453daf95051a
Merge ... '3aba2971138df7aa582ac37918b74312095155a5'
     and 'f2ba366303b50ed577f12c11d8179b1c9c3e5255'