From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Sun, 3 Dec 2006 22:10:04 +0000 (+0000)
Subject: merge of '1669749c4615b77d79a8df668ac9ce91730cf77a'
X-Git-Tag: Release-2010-05/1~9453^2~204^2~16
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=984a6d9b6cfac18cfad2a02dd30c450454d26b9b;p=openembedded.git

Merge ... '1669749c4615b77d79a8df668ac9ce91730cf77a'
     and '8f25eeb3d52cd94924df16c4c1790609c547ff6a'
---

984a6d9b6cfac18cfad2a02dd30c450454d26b9b