Merge remote-tracking branch 'origin/upstream'
authorMike McCormack <mj.mccormack@samsung.com>
Thu, 10 Nov 2011 05:40:36 +0000 (14:40 +0900)
committerMike McCormack <mj.mccormack@samsung.com>
Thu, 10 Nov 2011 05:40:36 +0000 (14:40 +0900)
1  2 
configure.ac

diff --cc configure.ac
Simple merge