Trying to merge master and bleed ...
commitaaaffbccbc0ac81b39dbe8b5c54e879690f68491
authorJonathan Leto <jonathan@leto.net>
Thu, 22 May 2008 03:53:07 +0000 (21 23:53 -0400)
committerJonathan Leto <jonathan@leto.net>
Thu, 22 May 2008 03:53:07 +0000 (21 23:53 -0400)
tree99c9bc2ff1ee82981def828a0c11d99d7c2c6858
parentf7f96f3d4f2d48cc7ecd5f60d3552cb9370ee8b5
parent47bbba31277edc7ac84f9372a81c3447ca832674
Trying to merge master and bleed ...

Merge branch 'bleed'

Conflicts:

Randist.i
t/Randist.t
Randist.i
t/Randist.t