Merge remote-tracking branch 'dpavlin/master'
authorBojan Petrovic <bojan_petrovic@fastmail.fm>
Sat, 21 May 2011 18:31:40 +0000 (20:31 +0200)
committerBojan Petrovic <bojan_petrovic@fastmail.fm>
Sat, 21 May 2011 18:31:40 +0000 (20:31 +0200)
Conflicts:
Fuse.xs

1  2 
Fuse.xs

diff --cc Fuse.xs
Simple merge