Merge branch 'master' into next
authorAndre Noll <maan@systemlinux.org>
Sun, 17 Jan 2010 20:36:41 +0000 (21:36 +0100)
committerAndre Noll <maan@systemlinux.org>
Sun, 17 Jan 2010 20:36:41 +0000 (21:36 +0100)
commitf42b5eccb6ec3364dc0500ffeffbe9d9ecab07bd
treed8ebeac1f452a060e046bf9dc9e8712aa74d45ce
parentecd2ef112f101a03dda582401d58080cd7c7c43d
parentb55f996a9d756a84b7fb880df6a9b917215ea058
Merge branch 'master' into next

Conflicts:
stdin.c