Merge branch 'master' into add-libcontainer

Conflicts:
	execdriver/termconsole.go

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: ce08083f9cd23e8f5e44228b0b73884bcf2f3562
Component: engine

components/engine/execdriver/native/term.go

@@ -6,14 +6,13 @@ package native
 
 import (
 	"github.com/dotcloud/docker/execdriver"
-	"github.com/dotcloud/docker/execdriver/lxc"
 	"io"
 	"os"
 	"os/exec"
 )
 
 type dockerStdTerm struct {
-	lxc.StdConsole
+	execdriver.StdConsole
 	pipes *execdriver.Pipes
 }
 
@@ -26,7 +25,7 @@ func (d *dockerStdTerm) SetMaster(master *os.File) {
 }
 
 type dockerTtyTerm struct {
-	lxc.TtyConsole
+	execdriver.TtyConsole
 	pipes *execdriver.Pipes
 }