Merge remote branch 'nobled/fixes2'
authorKristian Høgsberg <krh@bitplanet.net>
Thu, 6 Jan 2011 19:22:59 +0000 (14:22 -0500)
committerKristian Høgsberg <krh@bitplanet.net>
Thu, 6 Jan 2011 19:22:59 +0000 (14:22 -0500)
commit4e63c6313bb9167842d07c78ea3573307e75404a
tree7bf0d67df9c012caad8b973e9e5d2c3b87f0c67e
parentf1ef15cb45f8831b81aeefe03412dfb099f0220e
parent9835417962dcc65ee6c426ef8aad4cd1d979d82e
Merge remote branch 'nobled/fixes2'