Merge branch 'stable'
authorIan Beckwith <ianb@erislabs.net>
Sun, 15 Nov 2009 04:44:14 +0000 (04:44 +0000)
committerIan Beckwith <ianb@erislabs.net>
Sun, 15 Nov 2009 04:44:14 +0000 (04:44 +0000)
commitb7be78fd0c455acefbdf32618c2f6488915c1a33
treee1c81e51f2ce9aebf3f7935803d4a2b40bd54820
parent78969fdcffe4c4829a108e635745f8e4b78a46be
parent2899fc4aa1060fa3812fcfbc068a3e6146caba7b
Merge branch 'stable'