From: Koen Kooi <koen@openembedded.org>
Date: Fri, 13 Oct 2006 13:02:53 +0000 (+0000)
Subject: merge of '2af10c8f8ecac83cfb23286aebb3172d45a4a12f'
X-Git-Tag: Release-2010-05/1~9453^2~567^2~204^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5dee75a79132a577fd665f82ac453f0b4edfb9a4;p=openembedded.git

Merge ... '2af10c8f8ecac83cfb23286aebb3172d45a4a12f'
     and '51b5481655e96906c986a4ff927a78ce129f0109'
---

5dee75a79132a577fd665f82ac453f0b4edfb9a4