Merge branch 'master' into trac2421

author Mukund Sivaraman <muks@isc.org>

Sun, 18 Nov 2012 19:57:13 +0000 (01:27 +0530)

committer Mukund Sivaraman <muks@isc.org>

Sun, 18 Nov 2012 19:57:13 +0000 (01:27 +0530)
author Mukund Sivaraman <muks@isc.org>
Sun, 18 Nov 2012 19:57:13 +0000 (01:27 +0530)
committer Mukund Sivaraman <muks@isc.org>
Sun, 18 Nov 2012 19:57:13 +0000 (01:27 +0530)
diff --cc tests/lettuce/features/terrain/terrain.py
Simple merge
author	Mukund Sivaraman <muks@isc.org>
	Sun, 18 Nov 2012 19:57:13 +0000 (01:27 +0530)
committer	Mukund Sivaraman <muks@isc.org>
	Sun, 18 Nov 2012 19:57:13 +0000 (01:27 +0530)