Merge branch 'stable'
authorIan Beckwith <ianb@erislabs.net>
Tue, 17 Nov 2009 03:48:47 +0000 (03:48 +0000)
committerIan Beckwith <ianb@erislabs.net>
Tue, 17 Nov 2009 03:48:47 +0000 (03:48 +0000)
commit3af98c9767e5d168bd63103eb36d700a7e8182b8
tree047e1524cb095c4d594f590964efbefe431ed63a
parent56a31da07d1bb325f2951978f96c3e8b1fb3edcd
parent845329417429b29039794b9296ac004f025490a0
Merge branch 'stable'