merge mainline changes
commit5c90e3e8776092fd096406931971a147268d3db1
authorMaurizio Lombardi <m.lombardi85@gmail.com>
Thu, 18 Oct 2012 22:38:27 +0000 (18 22:38 +0000)
committerMaurizio Lombardi <m.lombardi85@gmail.com>
Thu, 18 Oct 2012 22:38:27 +0000 (18 22:38 +0000)
tree86327d1aabe0c4c23395263a60a0ca282692b3a9
parentb801f2d6becda84795177e84564a610b886dbea0
parent7d248e30694d6c4e542fe6d7997e4444c61c4ae8
merge mainline changes