From: Koen Kooi <koen@openembedded.org>
Date: Tue, 26 Sep 2006 13:47:00 +0000 (+0000)
Subject: merge of '300063bb2f3d1abb7a7532b48c45894ec6098d31'
X-Git-Tag: Release-2010-05/1~9453^2~692
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97b2a9ed72620b72f6325ad305db03e72b9d399d;p=openembedded.git

Merge ... '300063bb2f3d1abb7a7532b48c45894ec6098d31'
     and '60a1e8380dd7fc43fb994db1a4b4071e1a95b60b'
---

97b2a9ed72620b72f6325ad305db03e72b9d399d