[tomoe/el5: 13/13] merge master branch

[Peng Wu]

commit 1fc5123a66948de6a5a36fa9914b3ea49c824b1f
Merge: 52819d2 20e8743
Author: Peng Wu <alexepico at gmail.com>
Date:   Thu Feb 27 11:27:10 2014 +0800

    merge master branch

 .gitignore                            |    1 +
 sources                               |    1 +
 strip.sh                              |   38 +++++++++++++++++++++++++++++++++
 tomoe-0.6.0-fixes-glib-includes.patch |   26 ++++++++++++++++++++++
 tomoe.spec                            |   38 +++++++++++++++++++++++++++++---
 5 files changed, 100 insertions(+), 4 deletions(-)
---