From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Wed, 7 Mar 2007 21:13:57 +0000 (+0000)
Subject: merge of '3e9bce35baf6ce4cfadb07b45856fcd2cc535c3f'
X-Git-Tag: Release-2010-05/1~8868^2~1105^2~22
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8775f12f93346e3b83d4bd8927f9adb26633fa09;p=openembedded.git

Merge ... '3e9bce35baf6ce4cfadb07b45856fcd2cc535c3f'
     and '5f1842dd64866505c065323f06cce3ba0ab5d638'
---

8775f12f93346e3b83d4bd8927f9adb26633fa09