From: Matt Reimer <mattjreimer@gmail.com>
Date: Wed, 15 Feb 2006 00:50:07 +0000 (+0000)
Subject: merge of 34851fe4aecd36f7bfae3317e45d98f58bb6bc59
X-Git-Tag: Release-2010-05/1~9453^2~2356
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c5dd476be62e2ddbf5cd7b68e9cf6302784235d;p=openembedded.git

merge of 34851fe4aecd36f7bfae3317e45d98f58bb6bc59
     and 37212ffa007b0b42f88d05068588f8de0542e356
---

9c5dd476be62e2ddbf5cd7b68e9cf6302784235d