From: Koen Kooi <koen@openembedded.org>
Date: Fri, 15 Dec 2006 18:04:47 +0000 (+0000)
Subject: merge of '0214582b05132b8f733d073082c352b0d19100fd'
X-Git-Tag: Release-2010-05/1~9453^2~129^2~30
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56e8add4fae9835a65b3d980548164d5e9e46d20;p=openembedded.git

Merge ... '0214582b05132b8f733d073082c352b0d19100fd'
     and '14230563337c9e6187dd230e4e3cd50fffd742a8'
---

56e8add4fae9835a65b3d980548164d5e9e46d20