From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 17 Dec 2006 17:02:47 +0000 (+0000)
Subject: merge of f1aec3973fabc9c4f6c9f30f9428420022ef0d2f
X-Git-Tag: Release-2010-05/1~9453^2~27^2~11^2~2^2^2^2^2~3^2^2^2^2^2~2^2~2^2~6^2^2~1^2^2^2^2~6^2~2^2~2^2~1^2~1^2~1^2^2^2^2^2~1^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9da77c2cf155fa42df50b96a53cafd290be52049;p=openembedded.git

merge of f1aec3973fabc9c4f6c9f30f9428420022ef0d2f
     and f59136c4b28aaa19b16da93cb6a02370f346853e
---

9da77c2cf155fa42df50b96a53cafd290be52049