Merging changes from snapshot_3.0.9 to fix bug #2235
authorl.morris <l.morris@localhost>
Tue, 31 Jan 2012 16:42:36 +0000 (16:42 +0000)
committerl.morris <l.morris@localhost>
Tue, 31 Jan 2012 16:42:36 +0000 (16:42 +0000)
commit7de797a747e11f1fb2885fb58fe6bff494175070
tree3113a34f26889e7f3625642661d4a1fa3e888210
parent14422ade8cff210efbe772088dde1bbeef900d90
parent8bf0589ddac4ecb3b16390985c0277e3de601e73
Merging changes from snapshot_3.0.9 to fix bug #2235