Merging from trunk

svn path=/branches/release/tools/litre/; revision=84745