Merge commit '12319ff4e84ca616a671216d991dd6eaf1c39c47' into stable
authorIan Beckwith <ianb@erislabs.net>
Fri, 8 Jan 2010 04:12:31 +0000 (04:12 +0000)
committerIan Beckwith <ianb@erislabs.net>
Fri, 8 Jan 2010 04:12:31 +0000 (04:12 +0000)
commit8d8eda4eab3d2801251daf4eb31756c3595e2fc6
tree52a5259c22ee62bdb2e3c0eec0034952924f57f7
parent2d4d7d9d00fe33b6f5291e00a30b6c1016775b74
parent12319ff4e84ca616a671216d991dd6eaf1c39c47
Merge commit '12319ff4e84ca616a671216d991dd6eaf1c39c47' into stable