From: Koen Kooi <koen@openembedded.org>
Date: Fri, 16 Feb 2007 15:39:35 +0000 (+0000)
Subject: merge of 'aa2c7cca9146ef3910ca2f5ea908bc240fc478f9'
X-Git-Tag: Release-2010-05/1~9230^2~12
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07a6653bf7bbdd46124368760eddfe47393ee0a3;p=openembedded.git

Merge ... 'aa2c7cca9146ef3910ca2f5ea908bc240fc478f9'
     and 'b866b8272d34e10f3efd115e1dbb79b5287031e9'
---

07a6653bf7bbdd46124368760eddfe47393ee0a3