From: Graeme Gregory <dp@xora.org.uk>
Date: Thu, 15 Mar 2007 12:45:26 +0000 (+0000)
Subject: merge of '26fd08fc76668842e8ea86206990f5188bc3afa6'
X-Git-Tag: Release-2010-05/1~8868^2~1092^2~1^2~8^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4fe50b3a223bfa386736527fb7c8fa61e5b40d4e;p=openembedded.git

Merge ... '26fd08fc76668842e8ea86206990f5188bc3afa6'
     and '4c2e0c714dee3487dfde36966ee922357cfb407d'
---

4fe50b3a223bfa386736527fb7c8fa61e5b40d4e