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

[Chen Lei]

commit 9b0f0e03491af5e5bd05955d45a26433c4f228a2
Merge: 40d7116 87b44cb
Author: Chen Lei <supercyper at 163.com>
Date:   Sun Oct 31 02:59:09 2010 +0800

    Merge branch 'master' into f13

 .gitignore                     |    2 +-
 liborigin2-13092010-path.patch |   28 -
 liborigin2-20101029-path.patch |   18 +
 liborigin2.spec                |   34 +-
 sources                        |    2 +-
 tree.hh                        | 2710 ----------------------------------------
 6 files changed, 34 insertions(+), 2760 deletions(-)
---