From: Koen Kooi <koen@openembedded.org>
Date: Sun, 4 Feb 2007 11:11:42 +0000 (+0000)
Subject: merge of '64a99c44cf4b94f829d2fb02ed7fb05a16da4669'
X-Git-Tag: Release-2010-05/1~9299
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=efe359556d6854fe2953ecf586b00eedcdaf28cb;p=openembedded.git

Merge ... '64a99c44cf4b94f829d2fb02ed7fb05a16da4669'
     and 'bb6c1f5981b1f6f71320c3c1635ef323edc2a9e1'
---

efe359556d6854fe2953ecf586b00eedcdaf28cb