From: Koen Kooi <koen@openembedded.org>
Date: Fri, 16 Feb 2007 23:12:01 +0000 (+0000)
Subject: merge of '7bc0867c76d85a5f85fa0d7a9f66dfd4d9c499bb'
X-Git-Tag: Release-2010-05/1~9230^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f28e22242c82fe1ba1c4ad8514dd682fc732bc9;p=openembedded.git

Merge ... '7bc0867c76d85a5f85fa0d7a9f66dfd4d9c499bb'
     and 'c8821bce45c12f64b0b533cda3bbe41267c804d5'
---

1f28e22242c82fe1ba1c4ad8514dd682fc732bc9