From: Koen Kooi <koen@openembedded.org>
Date: Sat, 4 Aug 2007 15:52:38 +0000 (+0000)
Subject: merge of '01f644d2342bc10e83344874b38bcf616e576ad1'
X-Git-Tag: Release-2010-05/1~8868^2~13
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=383888843ffcd4b08fce785f8227ab2cfa23ebe4;p=openembedded.git

Merge ... '01f644d2342bc10e83344874b38bcf616e576ad1'
     and '373f8ffa5274d65898c8263d4e8f9b7e6edc7ac5'
---

383888843ffcd4b08fce785f8227ab2cfa23ebe4