From: Koen Kooi <koen@openembedded.org>
Date: Sun, 17 Jun 2007 10:25:34 +0000 (+0000)
Subject: merge of 'b0f2b6b66673367e2119e54761590a724c20c2e1'
X-Git-Tag: Release-2010-05/1~8868^2~344^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aff97e9475c2a48122851f24b5500fd11c4600c4;p=openembedded.git

Merge ... 'b0f2b6b66673367e2119e54761590a724c20c2e1'
     and 'd4199b222eb8c2755fae3eefe9fdbd225e6d9e81'
---

aff97e9475c2a48122851f24b5500fd11c4600c4