Merge branch 'stable'
authorIan Beckwith <ianb@erislabs.net>
Mon, 20 Dec 2010 20:57:58 +0000 (20:57 +0000)
committerIan Beckwith <ianb@erislabs.net>
Mon, 20 Dec 2010 20:57:58 +0000 (20:57 +0000)
commitb4dda08cc716942239d838134f86d885dfaa6d66
tree350cdaebd5738d1f63e83a7b7595ce95979a1d25
parent55bbfad78ee41a5f4170b113d6db2e02a429d08c
parentb2afc0ef1b344c83a6600ec8a809cdf0580c2103
Merge branch 'stable'