From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 13 Feb 2007 22:23:58 +0000 (+0000)
Subject: merge of '045b9bbf9c078611ba163403644caface6f217ee'
X-Git-Tag: Release-2010-05/1~9230^2~62
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11d500de7eb84fda424f15f5a3af4d3fa3f40327;p=openembedded.git

Merge ... '045b9bbf9c078611ba163403644caface6f217ee'
     and '50c9ee81517d5a1c32a7a7afe7a00793aabceb33'
---

11d500de7eb84fda424f15f5a3af4d3fa3f40327