[rubygem-hoe/f18: 10/10] Merge remote-tracking branch 'origin/master' into f18

[Mamoru Tasaka]

commit af3e52d5cbdddfa8f8e5c0d4d71c6600ea41c6eb
Merge: a0982c1 096300d
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Tue Jan 1 11:10:49 2013 +0900

    Merge remote-tracking branch 'origin/master' into f18

---