merge of '1828e091ae06fc2f6f869299de7c7187900c649c'
authorKoen Kooi <koen@openembedded.org>
Sun, 13 Jul 2008 14:08:17 +0000 (14:08 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 13 Jul 2008 14:08:17 +0000 (14:08 +0000)
commit03132ae61da2b8331d66c3f6b5ed0190aed26b28
tree4b8a234c562abe8a485baafb4ca509e840a7578a
parent100310f93696054353350b27a35c49f9b60b2015
parente080603555da3a2b2a023c15b31181583e16c962
Merge ... '1828e091ae06fc2f6f869299de7c7187900c649c'
     and '54383b7d45cbdbb90ca3491e4a105edd944c66ec'