Merge branch 'upstream' into stable
authorIan Beckwith <ianb@erislabs.net>
Mon, 14 Dec 2009 09:49:02 +0000 (09:49 +0000)
committerIan Beckwith <ianb@erislabs.net>
Mon, 14 Dec 2009 09:49:02 +0000 (09:49 +0000)
commit2d4d7d9d00fe33b6f5291e00a30b6c1016775b74
treed8c55d4b003913f76eccda1e58caebe431758d46
parentaeccd6b3e0bd347cb8f9f6cc1c5649c7fc7ca36c
parent766d4f1de6c26bb084382524eaed00b45ab3112c
Merge branch 'upstream' into stable

upstream commit: 766d4f1de6c26bb084382524eaed00b45ab3112c
Date:   Mon Dec 14 00:24:41 2009 +0100