From: Koen Kooi <koen@openembedded.org>
Date: Tue, 9 Sep 2008 13:15:32 +0000 (+0000)
Subject: merge of '3f94d65dac6aa5231048ff3e534da903ee56b856'
X-Git-Tag: Release-2010-05/1~6120^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d53f01576fcd2aa4a5d9f8a9020a0da16a1df7a;p=openembedded.git

Merge ... '3f94d65dac6aa5231048ff3e534da903ee56b856'
     and 'e1eb2ac7cd166c46d35294a5f5902e7325e8a8c9'
---

0d53f01576fcd2aa4a5d9f8a9020a0da16a1df7a