Merge branch 'stable'
authorIan Beckwith <ianb@erislabs.net>
Sun, 10 Jan 2010 01:02:59 +0000 (01:02 +0000)
committerIan Beckwith <ianb@erislabs.net>
Sun, 10 Jan 2010 01:02:59 +0000 (01:02 +0000)
commite031113dab8249c7225d83d112c2c01ee177c06b
treeb5dfd586c649e0d1c721dca5334b8087856f283d
parent1cdeb3640d54ed36f61d25d3065532f957b57870
parentd9735fffe9e73de91b7be2efa4c53a016edc22c9
Merge branch 'stable'