From: Justin Patrin <papercrane@gmail.com>
Date: Sat, 13 Aug 2005 00:54:35 +0000 (+0000)
Subject: merge of 2b96ead32d1d5f15cc59a0f801a519f3bf4644cf
X-Git-Tag: 2.6.0~3461
X-Git-Url: http://code.vuplus.com/gitweb/?a=commitdiff_plain;h=631ca0ec21d62a23bf2fdbee26a879d53d01df79;p=vuplus_openembedded

merge of 2b96ead32d1d5f15cc59a0f801a519f3bf4644cf
     and d34b6f078abca855ff8e570f35e7de8c121eebd0
---

631ca0ec21d62a23bf2fdbee26a879d53d01df79