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

[Daiki Ueno]

commit 7998ec14f67e34fa33d7ad1171ad3a23051bb863
Merge: 6ba05a3 fa37a89
Author: Daiki Ueno <ueno at unixuser.org>
Date:   Tue Jul 31 17:09:17 2012 +0900

    Merge branch 'master' into f17

 .gitignore            |    1 +
 groonga-httpd.service |   14 +++++++++++
 groonga.spec          |   63 +++++++++++++++++++++++++++++++++++++++++++-----
 sources               |    2 +-
 4 files changed, 72 insertions(+), 8 deletions(-)
---