Merge branch 'eduardo-1' of .git into next
authorZhang Rui <[email protected]>
Wed, 24 Apr 2013 13:43:00 +0000 (21:43 +0800)
committerZhang Rui <[email protected]>
Wed, 24 Apr 2013 13:43:00 +0000 (21:43 +0800)

Trivial merge