Merge branch 'dev' master v3.16
authorJon Masters <jcm@jonmasters.org>
Thu, 2 Jun 2011 17:55:01 +0000 (13:55 -0400)
committerJon Masters <jcm@jonmasters.org>
Thu, 2 Jun 2011 17:55:01 +0000 (13:55 -0400)
commit4026aad8bfb89d62bdf300694c92ee911c51968c
tree220dfe4ea8eeedd9f2134a56c42a494e90df5a91
parentf8e51716464f623e0fe09de68a401080c1b15952
parentf357bb28c6b8810ad08bffad2e8403dfff53edc1
Merge branch 'dev'

Conflicts:
ChangeLog

Signed-off-by: Jon Masters <jcm@jonmasters.org>