Merge branch 'stable'
authorIan Beckwith <ianb@erislabs.net>
Fri, 20 Nov 2009 01:00:58 +0000 (01:00 +0000)
committerIan Beckwith <ianb@erislabs.net>
Fri, 20 Nov 2009 01:00:58 +0000 (01:00 +0000)
Conflicts:
NEWS.stable


Trivial merge