From: leslie <unknown>
Date: Mon, 24 Aug 2009 12:19:27 +0000 (+0800)
Subject: merge stable
X-Git-Tag: upstream/620~187
X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=261cb30b0c48b95c9cc07e11162c76aea7cec6b7;p=sasc-ng.git

merge stable
---

261cb30b0c48b95c9cc07e11162c76aea7cec6b7