From: Koen Kooi <koen@openembedded.org>
Date: Mon, 27 Nov 2006 12:46:12 +0000 (+0000)
Subject: merge of '7b822d191962a6aa7f36fbc3f5fc943962cf04a4'
X-Git-Tag: Release-2010-05/1~9453^2~270
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57df117212cda3ea64f33606a8c0cfb7a3d009b4;p=openembedded.git

Merge ... '7b822d191962a6aa7f36fbc3f5fc943962cf04a4'
     and 'b53b3fbf92c1c0c6575e30aa48732b33fab1451b'
---

57df117212cda3ea64f33606a8c0cfb7a3d009b4