From: Koen Kooi <koen@openembedded.org>
Date: Wed, 26 Jul 2006 14:22:08 +0000 (+0000)
Subject: merge of '171104fab4f21e3a390cb753995beffa459843ab'
X-Git-Tag: Release-2010-05/1~9453^2~1113
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93ad5af574d5e0255f30f368bac17efef7f8a9fc;p=openembedded.git

Merge ... '171104fab4f21e3a390cb753995beffa459843ab'
     and 'f1ae9d5e5629b09643d5895312ada9a356e6b700'
---

93ad5af574d5e0255f30f368bac17efef7f8a9fc