Merge branch 'upstream' into stable
authorIan Beckwith <ianb@erislabs.net>
Sat, 23 Oct 2010 21:48:17 +0000 (22:48 +0100)
committerIan Beckwith <ianb@erislabs.net>
Sat, 23 Oct 2010 21:48:17 +0000 (22:48 +0100)
commit8c4874e600742f95ad38fbd6f518a3005ac4283c
tree87297e19134d5b181fdd8bb91f2b7b76b9d652a0
parent994f7e106dd065a52195b18c4cff18aa5309562d
parentba523890aa7bae76e3ac6b3ce68f22a79d25ce2c
Merge branch 'upstream' into stable