Merge branch 'jlouis/fixes'
commit77c466efdabf141713b9adf6539d6543572b9d64
authorJesper Louis Andersen <jesper.louis.andersen@gmail.com>
Fri, 1 Aug 2008 19:38:52 +0000 (1 21:38 +0200)
committerJesper Louis Andersen <jesper.louis.andersen@gmail.com>
Fri, 1 Aug 2008 19:38:52 +0000 (1 21:38 +0200)
tree70f85d08a25243f19401bda98f629cd338a99134
parent4e40e36bbb60481ffa5a580714092eeca2b9c844
parent46102e6ca3cc52e94241618d2bb606033f91b9b1
Merge branch 'jlouis/fixes'