From: Koen Kooi <koen@openembedded.org>
Date: Thu, 7 Feb 2008 11:29:05 +0000 (+0000)
Subject: merge of '0d8bbbcdb6668a128380d44dac827d05c8e25266'
X-Git-Tag: Release-2010-05/1~7713^2~30
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25a5a3fc7f62ba6488ffb11c3cd9ae07d33b378d;p=openembedded.git

Merge ... '0d8bbbcdb6668a128380d44dac827d05c8e25266'
     and '56d99745e997218245cc7d9ec59717796070a9d6'
---

25a5a3fc7f62ba6488ffb11c3cd9ae07d33b378d