From: Jean-Baptiste Queru <jbq@google.com>
Date: Fri, 8 Oct 2010 14:41:45 +0000 (-0700)
Subject: Manual merge of b273b20c
X-Git-Tag: android-x86-4.0-r1~4
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fexternal-ppp.git;a=commitdiff_plain;h=5a026501def9ad03b85c72159359d8e8bf58066a;hp=-c

Manual merge of b273b20c

"am a96c501e: Mark ip-up-vpn as optional"

Change-Id: I6bb8a4ac696ebb2ba24895698ff0a853117ab769
---

5a026501def9ad03b85c72159359d8e8bf58066a