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

[tmatsuu]

commit 5f566b7917da24316429e55f412886e1da30985b
Merge: 3c618ef 81cf782
Author: Takanori MATSUURA <t.matsuu at gmail.com>
Date:   Thu Jan 5 23:25:55 2012 +0900

    Merge branch 'master' into f15

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