merge of '190c583e92702619da237578aa0be6d527f7da36'
authorKoen Kooi <koen@openembedded.org>
Mon, 2 Jun 2008 21:47:44 +0000 (21:47 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 2 Jun 2008 21:47:44 +0000 (21:47 +0000)
commit6f39dc212d17ba83624d8b5569d61d028a1ef81b
tree5f82db9fc63fc0f9fa734ece8bb1f8b70f97c230
parenteab6ad32e2f6763570b21436a786b6af9d872fa8
parentacd2d821f61c2f849965be2d2253fbd525fb5b4b
Merge ... '190c583e92702619da237578aa0be6d527f7da36'
     and '9c471eb161aadbb6db3383632fbea28318826a54'