Merge branch 'stable'
authorIan Beckwith <ianb@erislabs.net>
Sat, 24 Apr 2010 18:53:12 +0000 (19:53 +0100)
committerIan Beckwith <ianb@erislabs.net>
Sat, 24 Apr 2010 18:53:12 +0000 (19:53 +0100)
commit576a4a948127d02c4a5add5d240d8453f39468be
treeee06ab20d4937997168ddb55b893661e76795820
parentc2900ad94bea0cae14648b000d6de65ac4b48468
parentb0544fa2003d95ad0fb670ee6afaca7fa751a651
Merge branch 'stable'