Merge branch 'upstream' from 3f08220c1a263dfc45f6e0ce6dcee97631dd5e56
authorIan Beckwith <ianb@erislabs.net>
Sun, 29 Aug 2010 01:48:54 +0000 (02:48 +0100)
committerIan Beckwith <ianb@erislabs.net>
Sun, 29 Aug 2010 01:48:54 +0000 (02:48 +0100)
commitfd9f58dc85f6a45cd244c78a54ad4610c01dbb15
tree0238eef73b1f1c1748fe036a968721d9b5f64e8d
parent2ed5d94bb961be40b153f0882d1de21170859922
parent3f08220c1a263dfc45f6e0ce6dcee97631dd5e56
Merge branch 'upstream' from 3f08220c1a263dfc45f6e0ce6dcee97631dd5e56
 into stable (upstream as of aug 17)