From: Koen Kooi <koen@openembedded.org>
Date: Sat, 12 Aug 2006 09:05:48 +0000 (+0000)
Subject: merge of '2813b5b33a80acca8e53166638a06c31c96fc819'
X-Git-Tag: Release-2010-05/1~9453^2~970^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b48fac219880c3a0e50ea63f320a3d13c1a53645;p=openembedded.git

Merge ... '2813b5b33a80acca8e53166638a06c31c96fc819'
     and '71d106209d375802f4d83fc7eba80d5515b6f572'
---

b48fac219880c3a0e50ea63f320a3d13c1a53645