From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 6 Jan 2007 23:47:18 +0000 (+0000)
Subject: merge of '56b3e4d13290394304aabe91089b40748c1c9e48'
X-Git-Tag: Release-2010-05/1~9435^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=019df48c9224843d2af684fccea23d36e23d3f57;p=openembedded.git

Merge ... '56b3e4d13290394304aabe91089b40748c1c9e48'
     and 'a903c08fa3db61f5aa3a94fcbefa5d13cbe207b1'
---

019df48c9224843d2af684fccea23d36e23d3f57