Merge branch '2.4-stable'
commitaa9594b0d38b012729a46fd519fcc369600f4c3e
authorEric Wong <normalperson@yhbt.net>
Wed, 15 Jun 2011 02:05:43 +0000 (15 02:05 +0000)
committerEric Wong <normalperson@yhbt.net>
Wed, 15 Jun 2011 02:05:43 +0000 (15 02:05 +0000)
treedd6ebb2fb23b4bb7b63f88c3c3df2e7060dd833b
parentbbf9a3bc0ca2d91705e27ad8bfb5c0ed9651a2ef
parentfdde0a27c51134d7a6a9cd1d66d93d1ac6640940
Merge branch '2.4-stable'

* 2.4-stable:
  kgio 2.4.2 - OpenSolaris build fix
  extconf: -lnsl and -lsocket checks for OpenSolaris