From: Koen Kooi <koen@openembedded.org>
Date: Tue, 9 Jan 2007 10:00:31 +0000 (+0000)
Subject: merge of '1494fe26d3240d31000724d1c5a00aaf8566b48b'
X-Git-Tag: Release-2010-05/1~9420^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55154121e10ee33c81ca4e8a450d5633ae02d948;p=openembedded.git

Merge ... '1494fe26d3240d31000724d1c5a00aaf8566b48b'
     and '28548b0eda864e1b3a44136bcced77ee8c1e9dab'
---

55154121e10ee33c81ca4e8a450d5633ae02d948