From: Koen Kooi <koen@openembedded.org>
Date: Tue, 14 Nov 2006 13:57:11 +0000 (+0000)
Subject: merge of '9addc8085e450d56da3a5559a74f27e8334b960b'
X-Git-Tag: Release-2010-05/1~9453^2~508
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5bb7716e36ad65eb9c8fd0e59ee51373a5e60f17;p=openembedded.git

Merge ... '9addc8085e450d56da3a5559a74f27e8334b960b'
     and 'c1863be30dcd78a9ffa2826bafd953535872103b'
---

5bb7716e36ad65eb9c8fd0e59ee51373a5e60f17