From: Koen Kooi <koen@openembedded.org>
Date: Fri, 5 Sep 2008 13:38:14 +0000 (+0000)
Subject: merge of 'ed07fd1cf78a54a3b29bc5b123624acb39c4f70a'
X-Git-Tag: Release-2010-05/1~6145^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b79d21867a0a8ae992886bb498848a1ad6156ff;p=openembedded.git

Merge ... 'ed07fd1cf78a54a3b29bc5b123624acb39c4f70a'
     and 'ff89d5794df8f2290ca5cb41d093b3f3083d36c5'
---

3b79d21867a0a8ae992886bb498848a1ad6156ff