[NearTree/f14: 7/7] Merge branch 'master' into f14

[tmatsuu]

commit f362f61930a9aaa0fbfb5a3043795d453efc4db2
Merge: be4145b f8863e8
Author: Takanori MATSUURA <t.matsuu at gmail.com>
Date:   Mon Jun 20 21:42:48 2011 +0900

    Merge branch 'master' into f14
    
    Conflicts:
    	NearTree.spec

 NearTree-2.4.tar.gz                                |  Bin 106761 -> 0 bytes
 ...2.3.1-fedora.patch => NearTree-3.1-fedora.patch |   12 ++++--------
 ...e-2.3.2-lib64.patch => NearTree-3.1-lib64.patch |   20 ++++++++++----------
 NearTree-3.1.tar.gz                                |  Bin 0 -> 141820 bytes
 NearTree.spec                                      |   14 ++++++++++----
 5 files changed, 24 insertions(+), 22 deletions(-)
---