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)
commit5efeef24814e1744e3c4f3109f82e700576439ab
treeb394d45f5bc8f93bd67903cd32ac8f90ca1f1c50
parent0ba9c4e22bc917a666b8762b734884e72c142ccf
parent883a8b3506e6818add1c162ce8de690afcfe79e3
Merge branch 'trim-auto'