Merge commit 'muq/master'; commit 'origin/master'
authorCillian de Roiste <cillian.deroiste@gmail.com>
Sun, 20 Jan 2008 23:20:01 +0000 (23:20 +0000)
committerCillian de Roiste <cillian.deroiste@gmail.com>
Sun, 20 Jan 2008 23:20:01 +0000 (23:20 +0000)

Trivial merge