From: Koen Kooi <koen@openembedded.org>
Date: Thu, 23 Aug 2007 08:28:58 +0000 (+0000)
Subject: merge of '2d9bb3f1e645b23643eaf7cf8ccc4f31c1b84f21'
X-Git-Tag: Release-2010-05/1~8826^2~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d9c001289bc5fffbcf15a69f866d914438c6140;p=openembedded.git

Merge ... '2d9bb3f1e645b23643eaf7cf8ccc4f31c1b84f21'
     and '873dfa47c10fc80c1aefe1dd805391a01b9124b9'
---

5d9c001289bc5fffbcf15a69f866d914438c6140