From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 9 Feb 2008 20:27:24 +0000 (+0000)
Subject: merge of '1758ca8d5730da9557179027a29b7ec740792934'
X-Git-Tag: Release-2010-05/1~7696^2~11^2~18
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d07910edb4b790a83c06164dc9bc1e426fc4079;p=openembedded.git

Merge ... '1758ca8d5730da9557179027a29b7ec740792934'
     and '75e04836bf8c030852e29dbec000bd081b31009e'
---

5d07910edb4b790a83c06164dc9bc1e426fc4079