From: Koen Kooi <koen@openembedded.org>
Date: Thu, 14 Sep 2006 11:18:52 +0000 (+0000)
Subject: merge of '178ad077ac028be1b22bf39a8144558596dbb686'
X-Git-Tag: Release-2010-05/1~9453^2~809
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54ef07897ac9cadb8d291dc05e4494ba68695411;p=openembedded.git

Merge ... '178ad077ac028be1b22bf39a8144558596dbb686'
     and 'f7550674270fdfc2af92801ae59716d552b9120b'
---

54ef07897ac9cadb8d291dc05e4494ba68695411