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)

Trivial merge