From: Leon Woestenberg <leon.woestenberg@gmail.com>
Date: Thu, 17 May 2007 17:01:35 +0000 (+0000)
Subject: merge of '161f25ff852644b094fb04a166a56a41156e3f66'
X-Git-Tag: Release-2010-05/1~8868^2~466^2^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a7668c797a0ce8728190d641c3a87d2e9ee312a;p=openembedded.git

Merge ... '161f25ff852644b094fb04a166a56a41156e3f66'
     and '2f7cdf8eacd78e273744583cd918480d48f69dc8'
---

1a7668c797a0ce8728190d641c3a87d2e9ee312a