From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 7 Sep 2007 21:28:01 +0000 (+0000)
Subject: merge of '76f17964c43f7ddee34e65c3b91d78a68aecd213'
X-Git-Tag: Release-2010-05/1~8701^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e99ec8115d43084aab8db32a7c6e0b362e648f82;p=openembedded.git

Merge ... '76f17964c43f7ddee34e65c3b91d78a68aecd213'
     and '965f72e4cde00c3f4d4826ce609b171e77b92e00'
---

e99ec8115d43084aab8db32a7c6e0b362e648f82