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)
Conflicts:
stdin.c


Trivial merge