From: Justin Patrin <papercrane@gmail.com>
Date: Fri, 13 Jan 2006 18:26:10 +0000 (+0000)
Subject: merge of 464cb51e4f1333becda8dfa1ccf4f9bbcea5514f
X-Git-Tag: 2.6.0~2156^2~6^2~1^2~1
X-Git-Url: http://code.vuplus.com/gitweb/?a=commitdiff_plain;h=e523c03092fc6cfeda92b045a4d188b328267930;p=vuplus_openembedded

merge of 464cb51e4f1333becda8dfa1ccf4f9bbcea5514f
     and b3735f13f3bb7c2565ab1e628c79b04596773c15
---

e523c03092fc6cfeda92b045a4d188b328267930