Merge branch 'trim-auto'
authorJosé Fonseca <jfonseca@vmware.com>
Mon, 28 Jan 2013 19:48:41 +0000 (19:48 +0000)
committerJosé Fonseca <jfonseca@vmware.com>
Mon, 28 Jan 2013 19:48:41 +0000 (19:48 +0000)

Trivial merge