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

[Chen Lei]

commit 3f3a6d728153d7b83d40c99b6bae0c811804a5c6
Merge: f325728 df8dd1b
Author: Chen Lei <supercyper at 163.com>
Date:   Sat Sep 4 08:57:13 2010 +0800

    Merge branch 'master' into f13

 .gitignore      |    2 +-
 liborigin2.spec |   52 +++++++++++++++++++++++++++++++---------------------
 sources         |    2 +-
 3 files changed, 33 insertions(+), 23 deletions(-)
---