From: Koen Kooi <koen@openembedded.org>
Date: Tue, 13 Mar 2007 12:37:38 +0000 (+0000)
Subject: merge of '6f74b1eb3fab7fe5291f29a3ca501a9512fc4ff3'
X-Git-Tag: Release-2010-05/1~8868^2~1092^2~1^2~7^2~17^2~12
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=283c1328b3ebdd4814870f829ac3c88c13e0d06c;p=openembedded.git

Merge ... '6f74b1eb3fab7fe5291f29a3ca501a9512fc4ff3'
     and '82fd07d559cea99227ba82e74e7ce9dc86abc33f'
---

283c1328b3ebdd4814870f829ac3c88c13e0d06c