From: Koen Kooi <koen@openembedded.org>
Date: Sat, 13 Jan 2007 13:07:55 +0000 (+0000)
Subject: merge of '91b2ffc800916b90a5871806e605e65d6b2806d2'
X-Git-Tag: Release-2010-05/1~9376
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b2b49338648be69c6cefb68358e934101cd489f;p=openembedded.git

Merge ... '91b2ffc800916b90a5871806e605e65d6b2806d2'
     and 'af92592c9cfb22c3fe7c7dc2280bb03043a3a22f'
---

8b2b49338648be69c6cefb68358e934101cd489f