Merge branch 'jc/solaris-0811' into next
commit94d6d14bffc2382c74adbe943340d2947b754fdf
authorJunio C Hamano <gitster@pobox.com>
Tue, 26 May 2009 06:14:00 +0000 (25 23:14 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 26 May 2009 06:14:00 +0000 (25 23:14 -0700)
treec853faa4f64e97f053a741349c8bad29e83a77e6
parentd1a16103ba803746c2d49a5586874f7edf65735c
parenta0c0be97d492ea870cb8fb626eaca43b4d9cf34f
Merge branch 'jc/solaris-0811' into next

* jc/solaris-0811:
  OpenSolaris 200811 (SunOS 5.11) does not want OLD_ICONV
  Teach Solaris that _XOPEN_SOURCE=600 really menas XPG6
Makefile