Merge remote-tracking branch 'ethereum/master' into develop

Conflicts:
	cmd/gexp/main.go

cmd/gexp/main.go

@@ -47,12 +47,11 @@ import (
 )
 
 const (
-
 	ClientIdentifier = "Gexp"
-	Version          = "1.1.1"
+	Version          = "1.1.2"
 	VersionMajor     = 1
 	VersionMinor     = 1
-	VersionPatch     = 1
+	VersionPatch     = 2
 )
 
 var (

miner/worker.go

@@ -434,7 +434,7 @@ func (self *worker) commitNewWork() {
 	tstart := time.Now()
 	parent := self.chain.CurrentBlock()
 	tstamp := tstart.Unix()
-	if parent.Time().Cmp(new(big.Int).SetInt64(tstamp)) != 1 {
+	if parent.Time().Cmp(new(big.Int).SetInt64(tstamp)) >= 0 {
 		tstamp = parent.Time().Int64() + 1
 	}
 	// this will ensure we're not going off too far in the future