From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sat, 7 Apr 2007 20:37:54 +0000 (+0000)
Subject: merge of 'b1c334170a435bd72300d5aa9313ae11e6f77adb'
X-Git-Tag: Release-2010-05/1~8868^2~749
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1373ee9a893b361753867311fcd20499a27a22b;p=openembedded.git

Merge ... 'b1c334170a435bd72300d5aa9313ae11e6f77adb'
     and 'e9ff260856d0c12099e73221885f9c7b5f02923e'
---

a1373ee9a893b361753867311fcd20499a27a22b