From: leslie <unknown>
Date: Thu, 20 Aug 2009 23:00:07 +0000 (+0800)
Subject: merge stable
X-Git-Tag: upstream/620~189
X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=7276bf4cfaff391c28b3b44a637ca000b0c36879;p=sasc-ng.git

merge stable
---

7276bf4cfaff391c28b3b44a637ca000b0c36879