From: Koen Kooi <koen@openembedded.org>
Date: Tue, 5 Sep 2006 20:11:40 +0000 (+0000)
Subject: merge of '331c796786f820575978cca1b06ff1676cbbfb45'
X-Git-Tag: Release-2010-05/1~9453^2~875^2~47^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b0ec1eeed007033b51b2933905bfb7aa335c2c2;p=openembedded.git

Merge ... '331c796786f820575978cca1b06ff1676cbbfb45'
     and '727e71965e5388b1cca1ae5bda4b54f7cdd317b7'
---

1b0ec1eeed007033b51b2933905bfb7aa335c2c2