Download patch
ref: ec84f4bcc90d6aa447860eba8235420edc79e41f parent: 3958118bf03c92aa547dbe3c77c5557ed4ad944b author: volvet <qizh@cisco.com> date: Fri Jan 3 09:49:45 EST 2014
resolve conflict