From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Tue, 27 Feb 2007 17:16:39 +0000 (+0000)
Subject: merge of '6ff9d848f46715bdb745a274b6611f75395b0755'
X-Git-Tag: Release-2010-05/1~9134^2~1^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be2fc3e17050b5271d1c51305bfca7d7670e7ba2;p=openembedded.git

Merge ... '6ff9d848f46715bdb745a274b6611f75395b0755'
     and 'b5baf49fc7cdce9f5faaa2e3303b691a5a10b339'
---

be2fc3e17050b5271d1c51305bfca7d7670e7ba2