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)
commit4a54e50009b89eb38f8733af018abd474127d828
treeef60d0d8ea134e7ba36f82b308213f6248a55a55
parent672350798d386fb72188a8333f70c53701511db7
parentaeccd6b3e0bd347cb8f9f6cc1c5649c7fc7ca36c
Merge branch 'stable'

Conflicts:
NEWS.stable