Merge branch 'jlouis/stopping' into next
commit42faf5d6f44ebbf43e74606b86a0bfb4b269cdb3
authorJesper Louis Andersen <jesper.louis.andersen@gmail.com>
Wed, 23 Jul 2008 13:58:56 +0000 (23 15:58 +0200)
committerJesper Louis Andersen <jesper.louis.andersen@gmail.com>
Wed, 23 Jul 2008 13:58:56 +0000 (23 15:58 +0200)
treea4ce477de599091276ce5992823e48194551e84c
parentfe27482623c3721ea5654d562b1f8ec1bce60266
parentfa21b63fe56fa04d653e7bd500a0ca2088cc173b
Merge branch 'jlouis/stopping' into next