From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Sat, 18 Nov 2006 12:32:07 +0000 (+0000)
Subject: merge of 0c958ec238b24c796d57fb29b8683551a9ed05a5
X-Git-Tag: Release-2010-05/1~9453^2~433
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ae022aec21aeb66a89c15c2be17fc849aab02cd;p=openembedded.git

merge of 0c958ec238b24c796d57fb29b8683551a9ed05a5
     and dcbd942b827e66bb27a6282eae5ee1e2f4c927e3
---

2ae022aec21aeb66a89c15c2be17fc849aab02cd