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

[Chen Lei]

commit 97890165486233d3e126c59a99bab7055c89c8b5
Merge: fd8665b df8dd1b
Author: Chen Lei <supercyper at 163.com>
Date:   Sat Sep 4 08:58:48 2010 +0800

    Merge branch 'master' into f12

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