From: Leon Woestenberg <leon.woestenberg@gmail.com>
Date: Thu, 6 Sep 2007 18:38:51 +0000 (+0000)
Subject: merge of 'b90c6e333490c73f6f5aae24f3e0898b87bef4df'
X-Git-Tag: Release-2010-05/1~8712
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7589dab7b4c398d55f348d9268923443c682865;p=openembedded.git

Merge ... 'b90c6e333490c73f6f5aae24f3e0898b87bef4df'
     and 'f42f34d21e079ddd26f790b8cfe615ab71d489cd'
---

a7589dab7b4c398d55f348d9268923443c682865