Merge branch 'stable'
authorIan Beckwith <ianb@erislabs.net>
Thu, 16 Dec 2010 23:55:04 +0000 (23:55 +0000)
committerIan Beckwith <ianb@erislabs.net>
Thu, 16 Dec 2010 23:55:04 +0000 (23:55 +0000)
commitf104dfe4e7676f832801a361a86f1e6387eb19b9
tree14afb3441ab549a4aaeff0488e05d8c2fe30273a
parent7490d3ce927d720566d145a5f42282f90b24396b
parent3b33d217d3e5f06f1f13e6a811c1bfddbc23f870
Merge branch 'stable'