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

[Chen Lei]

commit 82f2c4e8b2049645c0dda83659915951ba18686f
Merge: 9789016 73dc0b6
Author: Chen Lei <supercyper at 163.com>
Date:   Wed Oct 13 14:58:16 2010 +0800

    Merge branch 'master' into f12

 .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(-)
---