From: Koen Kooi <koen@openembedded.org>
Date: Mon, 20 Nov 2006 09:37:38 +0000 (+0000)
Subject: merge of '5aa0bfca72176a539f36057d142b7fbc248c3987'
X-Git-Tag: Release-2010-05/1~9453^2~405
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aea8fb5d62aff1f9056326fd5b8fd54d791912f0;p=openembedded.git

Merge ... '5aa0bfca72176a539f36057d142b7fbc248c3987'
     and '7f11ce9c6210928dc642453f15126ac6ff44f108'
---

aea8fb5d62aff1f9056326fd5b8fd54d791912f0