[NearTree/el6: 2/2] Merge branch 'master' into el6

[tmatsuu]

commit 75d736c38bb90117f3dec94ecaae58afb5cd7392
Merge: ffdfc8b 0cb6938
Author: Takanori MATSUURA <t.matsuu at gmail.com>
Date:   Fri Jan 6 00:11:40 2012 +0900

    Merge branch 'master' into el6

 .gitignore          |    1 +
 NearTree-3.1.tar.gz |  Bin 141820 -> 0 bytes
 NearTree.spec       |    8 ++++++--
 sources             |    2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)
---