From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sun, 22 Jan 2006 12:53:24 +0000 (+0000)
Subject: merge of f17d3087897a984c0e341c5bdec44b96a96c2bc5
X-Git-Tag: Release-2010-05/1~9453^2~2588
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c687aaf591ddb124967cb9c70e523cbe33afca1d;p=openembedded.git

merge of f17d3087897a984c0e341c5bdec44b96a96c2bc5
     and f9b462770824431301ae59aeb7968ecd519a5121
---

c687aaf591ddb124967cb9c70e523cbe33afca1d