Merge branch 'stable'
authorIan Beckwith <ianb@erislabs.net>
Sat, 24 Apr 2010 21:03:46 +0000 (22:03 +0100)
committerIan Beckwith <ianb@erislabs.net>
Sat, 24 Apr 2010 21:03:46 +0000 (22:03 +0100)
commitd06b0db2c44d7566334ecc1f5eb737a531cca538
treea8d7fdfdb0577fa20fa9c74c7178f1eff1609f34
parenta8f388076c6bc5ec6a9dd191ca703d23d9c22850
parent6af4134bc8b43ba159a71127f4abaeb0c2fc32e6
Merge branch 'stable'