From: Koen Kooi <koen@openembedded.org>
Date: Wed, 13 Dec 2006 22:34:09 +0000 (+0000)
Subject: merge of '184d60b944ea10ce3ad82441a2729777a0ff3122'
X-Git-Tag: Release-2010-05/1~9453^2~166
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e210c12199d05f2620d58e2f4e9128b04ed8967;p=openembedded.git

Merge ... '184d60b944ea10ce3ad82441a2729777a0ff3122'
     and '8229c859bf92c8ea8a4f24ee106221b9bdccc7e0'
---

1e210c12199d05f2620d58e2f4e9128b04ed8967