Merge branch 'upstream' into stable
authorIan Beckwith <ianb@erislabs.net>
Fri, 11 Feb 2011 03:09:19 +0000 (03:09 +0000)
committerIan Beckwith <ianb@erislabs.net>
Fri, 11 Feb 2011 03:09:19 +0000 (03:09 +0000)
commitd599e5add275f75ed08e6527b8ee4d3f4f7c3aea
treee360aaa6e1f5c94678717199b911f6d7fd76b78e
parentf3fa1c2af480d045c07bd955fdcbfc21f48af45c
parenta036b7684f9671ee53999773785d1865603c3849
Merge branch 'upstream' into stable