From: Koen Kooi <koen@openembedded.org>
Date: Fri, 12 Oct 2007 07:54:22 +0000 (+0000)
Subject: merge of '5e25d910364ba4a7edab739d7fd27220ff39668f'
X-Git-Tag: Release-2010-05/1~8549^2~1^2~83^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac24763c52746d29e474e296392a9d5a1e29fdf2;p=openembedded.git

Merge ... '5e25d910364ba4a7edab739d7fd27220ff39668f'
     and '90a4eb99d1b346a81de3232bd341d5b76a2bbc2c'
---

ac24763c52746d29e474e296392a9d5a1e29fdf2