[groonga/f17: 6/6] Merge branch 'master' into f17

[Daiki Ueno]

commit 09ccb4c93709c4a5a3b03b57eec65c330532a157
Merge: 3ada304 a79db90
Author: Daiki Ueno <ueno at unixuser.org>
Date:   Mon Jul 2 12:07:09 2012 +0900

    Merge branch 'master' into f17

 .gitignore   |    1 +
 groonga.spec |   15 ++++++++++++---
 sources      |    2 +-
 3 files changed, 14 insertions(+), 4 deletions(-)
---