From: Joseph Cole <jnc@unknown.openembedded.org>
Date: Sun, 26 Feb 2006 04:17:48 +0000 (+0000)
Subject: merge of 931370684daa1b1fc8aac0ef4e41d0ba46bb6517
X-Git-Tag: Release-2010-05/1~9453^2~2304^2~39^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13e80da35d72de5b04cf2cb4195529d2da885434;p=openembedded.git

merge of 931370684daa1b1fc8aac0ef4e41d0ba46bb6517
     and b0535ae5d884f64c3f25212755c0dbbd607a4984
---

13e80da35d72de5b04cf2cb4195529d2da885434