Merge branch 'master' into new_info_panels
authorKaj Wallin <kaj.wallin@ixonos.com>
Thu, 6 May 2010 10:24:38 +0000 (13:24 +0300)
committerKaj Wallin <kaj.wallin@ixonos.com>
Thu, 6 May 2010 10:24:38 +0000 (13:24 +0300)
commitf83d0003d4797ba3afe0178b164b8552d07fd21d
tree40807459ed5c5e498bc7b24d4342e864a277ac89
parentfc70630ea643878f90806a544fee8e69f0d88f3d
parent3a7c16f6a3c7a313ab208e1b8f992a303f07fef4
Merge branch 'master' into new_info_panels
src/src.pro