From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 24 Mar 2007 09:52:55 +0000 (+0000)
Subject: merge of '1889b23e60bd0651ca48e0e38b914ffedce70bd2'
X-Git-Tag: Release-2010-05/1~8868^2~997
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc11f4a9df443abfe39313ed1e58bfefe06f54a0;p=openembedded.git

Merge ... '1889b23e60bd0651ca48e0e38b914ffedce70bd2'
     and '5df32e0915ba204f944bb2bfc083f0cb605f466f'
---

fc11f4a9df443abfe39313ed1e58bfefe06f54a0