From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 27 Dec 2006 13:51:04 +0000 (+0000)
Subject: merge of 2040fbc4df2aa380693c353ed60010c6857265d0
X-Git-Tag: Release-2010-05/1~9453^2~27^2~7^2~1^2^2^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7aba308e8d46ea2a0ef693450c5b05c419b402a7;p=openembedded.git

merge of 2040fbc4df2aa380693c353ed60010c6857265d0
     and ef924411754c1c1f26a65eae1204fc70c19ceafa
---

7aba308e8d46ea2a0ef693450c5b05c419b402a7