Yury G. Kudryashov 2bca92e32d Merge trunk ... Conflicts: 1. cmake upgrade: use 2.8.7 2. openssl: left FreeBSD-asm patch. svn path=/nixpkgs/branches/stdenv-updates/; revision=31245		2012-01-03 17:25:24 +00:00
..
darwin
gnu	GNU Hurd: Update.	2011-11-19 14:27:46 +00:00
linux	Merge trunk	2012-01-03 17:25:24 +00:00
windows