From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 31 Dec 2006 21:47:16 +0000 (+0000)
Subject: merge of 75df08ef6f859dde5bd1e1929e94ba188247d5a3
X-Git-Tag: Release-2010-05/1~9453^2~34^2~1^2~1^2~1^2~1^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7cd3fe397d417ecf993172bb363e629faedb8fc2;p=openembedded.git

merge of 75df08ef6f859dde5bd1e1929e94ba188247d5a3
     and abb83ffc2c99e23157f03c5799d2e3c6d1629808
---

7cd3fe397d417ecf993172bb363e629faedb8fc2