From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 17 Dec 2006 12:33:29 +0000 (+0000)
Subject: merge of 0e7cf314445d29e0276495334a084542f8d43c44
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^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6bb8aef220d789d541ba5a9686a2ee17119f6f99;p=openembedded.git

merge of 0e7cf314445d29e0276495334a084542f8d43c44
     and e715d97043723bd6f5de46239548acce2298191a
---

6bb8aef220d789d541ba5a9686a2ee17119f6f99