[autoconf-archive/f15: 3/3] Merge branch 'master' into origin/f15

[tmatsuu]

commit 19d9ff26e635feb93a9488e42874123f5066b96f
Merge: 06fe4e7 f72c6aa
Author: Takanori MATSUURA <t.matsuu at gmail.com>
Date:   Sat Aug 6 00:28:01 2011 +0900

    Merge branch 'master' into origin/f15
    
    Conflicts:
    	autoconf-archive.spec

 autoconf-archive-2011.07.17.tar.xz |  Bin 0 -> 486924 bytes
 autoconf-archive.spec              |    5 ++++-
 2 files changed, 4 insertions(+), 1 deletions(-)
---