Manually merge patch 4b1135a277f4b38f60b9c9f28adae467feb07856
authorTony Lindgren <tony@atomide.com>
Fri, 31 Oct 2008 22:12:35 +0000 (15:12 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 31 Oct 2008 22:12:35 +0000 (15:12 -0700)
Looks like automerge hosed it somehow.

Signed-off-by: Tony Lindgren <tony@atomide.com>

No differences found