Merge branch 'next' into issue-27
commit558cd998e5cb4c1ff27c84da6ed960455d80a87e
authorDave Peticolas <dave@krondo.com>
Thu, 19 Feb 2009 03:06:11 +0000 (18 19:06 -0800)
committerDave Peticolas <dave@krondo.com>
Thu, 19 Feb 2009 03:06:11 +0000 (18 19:06 -0800)
treed1dbc64c519d638d53538a150f54704a44f309a6
parent5d62575bac3faff4f3837307eb2c42015015931a
parentf39ba2015003ad98b4ea66117140f67ca3a6d6f8
Merge branch 'next' into issue-27

Conflicts:
test.erl
test.erl