merge of 'ed07fd1cf78a54a3b29bc5b123624acb39c4f70a'
authorKoen Kooi <koen@openembedded.org>
Fri, 5 Sep 2008 13:38:14 +0000 (13:38 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 5 Sep 2008 13:38:14 +0000 (13:38 +0000)
commit3b79d21867a0a8ae992886bb498848a1ad6156ff
treeee7c0a915f0d369a0fb9c423788dd3a06bd05367
parent20ceeaa57c1cf5b05e78454d2252838d0ef48e3b
parent7ec0a17ee44c992d5afdd4c5f5e3c10bc7941d22
Merge ... 'ed07fd1cf78a54a3b29bc5b123624acb39c4f70a'
     and 'ff89d5794df8f2290ca5cb41d093b3f3083d36c5'