From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Fri, 29 Dec 2006 19:30:32 +0000 (+0000)
Subject: merge of '149dfb1081cb62d1c9aa3bbe4e3da5da3136a2f0'
X-Git-Tag: Release-2010-05/1~9453^2~81^2~7^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d216638d680403b12d5ca54e7dc69f741224e67c;p=openembedded.git

Merge ... '149dfb1081cb62d1c9aa3bbe4e3da5da3136a2f0'
     and '2b9d4857ec4fc9b7d0efa0dbf18c7a2b6f5b788f'
---

d216638d680403b12d5ca54e7dc69f741224e67c