Merge branch 'stable'
authorIan Beckwith <ianb@erislabs.net>
Wed, 22 Dec 2010 23:15:00 +0000 (23:15 +0000)
committerIan Beckwith <ianb@erislabs.net>
Wed, 22 Dec 2010 23:15:00 +0000 (23:15 +0000)
commit914063ea52e0f9947c2c14b188eadd22c5fc9fe6
treec72a203ade852ff6483f17b7ca63d7a2c6a910fc
parentcc0c36b863c252f6652299f555152c38cc4d1330
parentf3fa1c2af480d045c07bd955fdcbfc21f48af45c
Merge branch 'stable'