Merge branch 'upstream' into test
authorIan Beckwith <ianb@erislabs.net>
Fri, 17 Jun 2011 19:29:43 +0000 (20:29 +0100)
committerIan Beckwith <ianb@erislabs.net>
Fri, 17 Jun 2011 19:29:43 +0000 (20:29 +0100)
commit411dc6a9768de308b60f383ce5c278b25b740122
treec747504468ff5e437699a1265c1397172a3dce0d
parent5e42ed7ef542f98b19dec6d8e14dcbd5d1e94d72
parent31e271107096d1ffa97b7d0c15222b8bd5e69f74
Merge branch 'upstream' into test