Merge fixes in r10.11
commitdf5f0a18254cb6a417a7bcacb4eb42fb29b24e72
authorIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Sun, 13 Jun 2010 07:42:30 +0000 (13 10:42 +0300)
committerIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Sun, 13 Jun 2010 07:42:30 +0000 (13 10:42 +0300)
treeaace6bd62126ab8ff3d34e09ca406e481651038b
parent21a505c8c2f8361a4bf09b3648714898b842c772
parentfbd1f2f15489488c5630952724517d0d8f159638
Merge fixes in r10.11

Conflicts:
Changelog.utf8
Changelog.utf8
org/jpc/j2se/JPCApplication.java