From: Koen Kooi <koen@openembedded.org>
Date: Sun, 4 Feb 2007 22:50:59 +0000 (+0000)
Subject: merge of '11f0ee99928fd3f1abcbb6452894ad035ca86caf'
X-Git-Tag: Release-2010-05/1~9286
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e92b1387151891718014d27a15b1174cffed2f8;p=openembedded.git

Merge ... '11f0ee99928fd3f1abcbb6452894ad035ca86caf'
     and 'a5e5f5fafe980604ae345371946d6043cff860d3'
---

4e92b1387151891718014d27a15b1174cffed2f8