[liborigin2/f13/master: 2/2] Merge branch 'master' into f13

[Chen Lei]

commit 40d7116703d48dfdd6670bf4e88976c01de0872d
Merge: 3f3a6d7 73dc0b6
Author: Chen Lei <supercyper at 163.com>
Date:   Wed Oct 13 14:57:15 2010 +0800

    Merge branch 'master' into f13

 .gitignore                     |    2 +-
 liborigin2-13092010-path.patch |   28 +
 liborigin2-svn1748-path.patch  |   44 -
 liborigin2.spec                |   52 +-
 sources                        |    2 +-
 tree.hh                        | 2710 ++++++++++++++++++++++++++++++++++++++++
 6 files changed, 2750 insertions(+), 88 deletions(-)
---