From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 8 Jan 2006 00:45:28 +0000 (+0000)
Subject: merge of 61486dc9a1b23e7088c746a1a9d6c6199cc8f5a5
X-Git-Tag: Release-2010-05/1~9453^2~2707^2^2~11^2^2~7^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01be40e07087d4fe7fdcf26f952a0ef5f97ca03e;p=openembedded.git

merge of 61486dc9a1b23e7088c746a1a9d6c6199cc8f5a5
     and b1dcd027693e6239eac9bebf42988acd618f1125
---

01be40e07087d4fe7fdcf26f952a0ef5f97ca03e